@nfdi4plants/arctrl 3.1.1 → 3.2.0

package/dist/ts/ts/Spreadsheet/AnnotationTable/CompositeHeader.js

@@ -1,13 +1,13 @@
-import { toFail, printf } from '../../../node_modules/@fable-org/fable-library-js/String.js';
-import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { toFail, printf, concat } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
+import { value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
 import { unitizedFromStringCells, termFromStringCells, dataFromStringCells, freeTextFromStringCells } from './CompositeCell.js';
-import { CompositeHeader_Parameter, CompositeHeader_Factor, CompositeHeader_Characteristic, CompositeHeader_Component, IOType, CompositeHeader_Input, IOType_Data, CompositeHeader_Output, CompositeHeader_Comment, CompositeHeader_ProtocolType, CompositeHeader_Date, CompositeHeader_Performer, CompositeHeader_ProtocolVersion, CompositeHeader_ProtocolUri, CompositeHeader_ProtocolDescription, CompositeHeader_ProtocolREF, CompositeHeader_FreeText } from '../../Core/Table/CompositeHeader.js';
-import { equalsWith, item, skip, tryFindIndex } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
-import { defaultOf } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
+import { defaultOf } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { CompositeHeader_Parameter, CompositeHeader_Factor, CompositeHeader_Characteristic, CompositeHeader_Component, IOType, CompositeHeader_Input, CompositeHeader_Output, CompositeHeader_Comment$, CompositeHeader, CompositeHeader_FreeText } from '../../Core/Table/CompositeHeader.js';
+import { equalsWith, item, skip, tryFindIndex } from '../../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { ActivePatterns_$007CTSRColumnHeader$007C_$007C, ActivePatterns_$007CTANColumnHeader$007C_$007C, ActivePatterns_$007CUnitColumnHeader$007C_$007C, tryParseParameterColumnHeader, tryParseFactorColumnHeader, tryParseCharacteristicColumnHeader, tryParseComponentColumnHeader, ActivePatterns_$007CInputColumnHeader$007C_$007C, ActivePatterns_$007COutputColumnHeader$007C_$007C, ActivePatterns_$007CComment$007C_$007C } from '../../Core/Helper/Regex.js';
-import { toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
-import { toArray, delay, append, singleton, empty } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { toString } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { toArray, delay, append, singleton, empty } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
 
 function ActivePattern_mergeIDInfo(idSpace1, localID1, idSpace2, localID2) {
   if (idSpace1 !== idSpace2) {
@@ -17,13 +17,13 @@ function ActivePattern_mergeIDInfo(idSpace1, localID1, idSpace2, localID2) {
     toFail(printf("LocalID %s and %s do not match"))(localID1)(localID2);
   }
   return {
-    TermAccessionNumber: `${idSpace1}:${localID1}`,
+    TermAccessionNumber: concat(idSpace1, ":", localID1),
     TermSourceRef: idSpace1
   };
 }
 function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cellValues) {
   const $007CAC$007C_$007C = categoryParser;
-  let matchResult, name, name_1, term1, term2;
+  let matchResult = void 0, name = void 0, name_1 = void 0, term1 = void 0, term2 = void 0;
   if (!equalsWith((x, y) => x === y, cellValues, defaultOf()) && cellValues.length === 1) {
     const activePatternResult = $007CAC$007C_$007C(item(0, cellValues));
     if (activePatternResult != null) {
@@ -63,7 +63,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cellValues) {
       return [f(OntologyAnnotation.create(name_1, term.TermSourceRef, term.TermAccessionNumber)), (cellValues_2) => termFromStringCells(1, 2, cellValues_2)];
     }
     default: {
-      let matchResult_1, name_2, term1_1, term2_1;
+      let matchResult_1 = void 0, name_2 = void 0, term1_1 = void 0, term2_1 = void 0;
       if (!equalsWith((x_2, y_2) => x_2 === y_2, cellValues, defaultOf()) && cellValues.length === 3) {
         const activePatternResult_4 = $007CAC$007C_$007C(item(0, cellValues));
         if (activePatternResult_4 != null) {
@@ -93,7 +93,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cellValues) {
           return [f(OntologyAnnotation.create(name_2, term_1.TermSourceRef, term_1.TermAccessionNumber)), (cellValues_3) => termFromStringCells(2, 1, cellValues_3)];
         }
         default: {
-          let matchResult_2, name_3, term1_2, term2_2;
+          let matchResult_2 = void 0, name_3 = void 0, term1_2 = void 0, term2_2 = void 0;
           if (!equalsWith((x_3, y_3) => x_3 === y_3, cellValues, defaultOf()) && cellValues.length === 4) {
             const activePatternResult_7 = $007CAC$007C_$007C(item(0, cellValues));
             if (activePatternResult_7 != null) {
@@ -127,7 +127,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cellValues) {
               return [f(OntologyAnnotation.create(name_3, term_2.TermSourceRef, term_2.TermAccessionNumber)), (cellValues_4) => unitizedFromStringCells(1, 2, 3, cellValues_4)];
             }
             default: {
-              let matchResult_3, name_4, term1_3, term2_3;
+              let matchResult_3 = void 0, name_4 = void 0, term1_3 = void 0, term2_3 = void 0;
               if (!equalsWith((x_4, y_4) => x_4 === y_4, cellValues, defaultOf()) && cellValues.length === 4) {
                 const activePatternResult_11 = $007CAC$007C_$007C(item(0, cellValues));
                 if (activePatternResult_11 != null) {
@@ -218,9 +218,13 @@ function ActivePattern_$007CInput$007C_$007C(cellValues) {
       const matchValue_1 = IOType.ofString(ioType);
       if (matchValue_1.tag === /* Data */
       2) {
-        const format = map((y) => 1 + y, tryFindIndex((s) => s.startsWith("Data Format"), cols));
-        const selectorFormat = map((y_1) => 1 + y_1, tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols));
-        return [CompositeHeader_Input(IOType_Data()), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
+        let format;
+        const option_1 = tryFindIndex((s) => s.startsWith("Data Format"), cols);
+        format = option_1 != null ? 1 + value(option_1) : void 0;
+        let selectorFormat;
+        const option_3 = tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols);
+        selectorFormat = option_3 != null ? 1 + value(option_3) : void 0;
+        return [CompositeHeader_Input(IOType.Data), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
       } else {
         return [CompositeHeader_Input(matchValue_1), freeTextFromStringCells];
       }
@@ -241,9 +245,13 @@ function ActivePattern_$007COutput$007C_$007C(cellValues) {
       const matchValue_1 = IOType.ofString(ioType);
       if (matchValue_1.tag === /* Data */
       2) {
-        const format = map((y) => 1 + y, tryFindIndex((s) => s.startsWith("Data Format"), cols));
-        const selectorFormat = map((y_1) => 1 + y_1, tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols));
-        return [CompositeHeader_Output(IOType_Data()), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
+        let format;
+        const option_1 = tryFindIndex((s) => s.startsWith("Data Format"), cols);
+        format = option_1 != null ? 1 + value(option_1) : void 0;
+        let selectorFormat;
+        const option_3 = tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols);
+        selectorFormat = option_3 != null ? 1 + value(option_3) : void 0;
+        return [CompositeHeader_Output(IOType.Data), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
       } else {
         return [CompositeHeader_Output(matchValue_1), freeTextFromStringCells];
       }
@@ -253,7 +261,7 @@ function ActivePattern_$007COutput$007C_$007C(cellValues) {
   }
 }
 function ActivePattern_$007CComment$007C_$007C(cellValues) {
-  let matchResult, key;
+  let matchResult = void 0, key = void 0;
   if (!equalsWith((x, y) => x === y, cellValues, defaultOf()) && cellValues.length === 1) {
     const activePatternResult = ActivePatterns_$007CComment$007C_$007C(item(0, cellValues));
     if (activePatternResult != null) {
@@ -267,7 +275,7 @@ function ActivePattern_$007CComment$007C_$007C(cellValues) {
   }
   switch (matchResult) {
     case 0:
-      return [CompositeHeader_Comment(key), freeTextFromStringCells];
+      return [CompositeHeader_Comment$(key), freeTextFromStringCells];
     default:
       return void 0;
   }
@@ -279,7 +287,7 @@ function ActivePattern_$007CProtocolType$007C_$007C(cellValues) {
     } else {
       return void 0;
     }
-  }, (_arg) => CompositeHeader_ProtocolType(), cellValues);
+  }, (_arg) => CompositeHeader.ProtocolType, cellValues);
   if (activePatternResult != null) {
     const r = value(activePatternResult);
     return r;
@@ -288,7 +296,7 @@ function ActivePattern_$007CProtocolType$007C_$007C(cellValues) {
   }
 }
 function ActivePattern_$007CProtocolHeader$007C_$007C(cellValues) {
-  let matchResult;
+  let matchResult = void 0;
   if (!equalsWith((x, y) => x === y, cellValues, defaultOf()) && cellValues.length === 1) {
     if (item(0, cellValues) === "Protocol REF") {
       matchResult = 0;
@@ -310,17 +318,17 @@ function ActivePattern_$007CProtocolHeader$007C_$007C(cellValues) {
   }
   switch (matchResult) {
     case 0:
-      return [CompositeHeader_ProtocolREF(), freeTextFromStringCells];
+      return [CompositeHeader.ProtocolREF, freeTextFromStringCells];
     case 1:
-      return [CompositeHeader_ProtocolDescription(), freeTextFromStringCells];
+      return [CompositeHeader.ProtocolDescription, freeTextFromStringCells];
     case 2:
-      return [CompositeHeader_ProtocolUri(), freeTextFromStringCells];
+      return [CompositeHeader.ProtocolUri, freeTextFromStringCells];
     case 3:
-      return [CompositeHeader_ProtocolVersion(), freeTextFromStringCells];
+      return [CompositeHeader.ProtocolVersion, freeTextFromStringCells];
     case 4:
-      return [CompositeHeader_Performer(), freeTextFromStringCells];
+      return [CompositeHeader.Performer, freeTextFromStringCells];
     case 5:
-      return [CompositeHeader_Date(), freeTextFromStringCells];
+      return [CompositeHeader.Date$, freeTextFromStringCells];
     default:
       return void 0;
   }
@@ -401,7 +409,7 @@ function toStringCells(hasUnit, header) {
   } else if (header.IsSingleColumn) {
     return [toString(header)];
   } else if (header.IsTermColumn) {
-    return toArray(delay(() => append(singleton(toString(header)), delay(() => append(hasUnit ? singleton("Unit") : empty(), delay(() => append(singleton(`Term Source REF (${header.GetColumnAccessionShort})`), delay(() => singleton(`Term Accession Number (${header.GetColumnAccessionShort})`)))))))));
+    return toArray(delay(() => append(singleton(toString(header)), delay(() => append(hasUnit ? singleton("Unit") : empty(), delay(() => append(singleton(concat("Term Source REF (", header.GetColumnAccessionShort, ")")), delay(() => singleton(concat("Term Accession Number (", header.GetColumnAccessionShort, ")"))))))))));
   } else {
     return toFail(printf("header %O is neither single nor term column"))(header);
   }

package/dist/ts/ts/Spreadsheet/ArcAssay.d.ts

@@ -1,8 +1,8 @@
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { ArcAssay } from '../Core/ArcTypes.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { ArcAssay } from '../Core/ArcTypes.ts';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 export declare function ArcAssay_fromRows(rows: Iterable<Iterable<[int32, string]>>): ArcAssay;
 export declare function ArcAssay_toRows(assay: ArcAssay): Iterable<Iterable<[int32, string]>>;
 export declare function ArcAssay_toMetadataSheet(assay: ArcAssay): FsWorksheet;
@@ -27,5 +27,5 @@ export declare function ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(
  *
  * If datamapSheet is true, the datamap will be written to a worksheet inside assay workbook.
  */
-export declare function ARCtrl_ArcAssay__ArcAssay_ToFsWorkbook_6FCE9E49(this$: ArcAssay, datamapSheet: Option<boolean>): FsWorkbook;
+export declare function ARCtrl_ArcAssay__ArcAssay_ToFsWorkbook_6FCE9E49(this$: ArcAssay, datamapSheet?: boolean): FsWorkbook;
 //# sourceMappingURL=ArcAssay.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArcAssay.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcAssay.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAiD,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAK9G,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,gEAAgE,CAAC;AAG7F,OAAO,EAAE,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAM3F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAkFrF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAEpF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,WAAW,CAMrE;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAavE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAEjG;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAQxG;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAEjF;AAED;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,CAwBlG;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAgB3H;AAED;;;;GAIG;AACH,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAE1H"}
+{"version":3,"file":"ArcAssay.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcAssay.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAwC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAKrG,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAGrF,OAAO,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAMnF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAkFrF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAEpF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,WAAW,CAMrE;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAavE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAEjG;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAQxG;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAEjF;AAED;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,CAwBlG;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAiB3H;AAED;;;;GAIG;AACH,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAEnH"}

package/dist/ts/ts/Spreadsheet/ArcAssay.js

@@ -1,15 +1,15 @@
-import { exists, head, tryHead, delay, append, singleton, iterateIndexed, map, tryFind, choose, tryPick, isEmpty as isEmpty$1, iterate } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { value, defaultArg, toArray, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { getEnumerator } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { exists, head, tryHead, delay, append, singleton, iterateIndexed, map, tryFind, choose, tryPick, isEmpty as isEmpty$1 } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { value, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { getEnumerator, Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { fromRows as fromRows$1, toRows } from './Metadata/Assays.js';
-import { isEmpty, empty, singleton as singleton$1, ofSeq } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { isEmpty, empty, singleton as singleton$1, ofSeq } from '../../node_modules/@fable-org/fable-library-ts/List.js';
 import { ArcAssay } from '../Core/ArcTypes.js';
 import { fromRows, toRows as toRows$1 } from './Metadata/Contacts.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromValues, SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_getAllValues, SparseRowModule_fromAllValues } from './Metadata/SparseTable.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 import { tryFromFsWorksheet, toFsWorksheet as toFsWorksheet$1 } from './AnnotationTable/ArcTable.js';
 import { tryFromFsWorksheet as tryFromFsWorksheet$1, toFsWorksheet } from './DatamapTable/DatamapTable.js';
 
@@ -20,11 +20,11 @@ function ArcAssay_fromRows(rows) {
   }, rows) ? ["Assay", "Assay Person"] : [void 0, void 0];
   const en = getEnumerator(rows);
   const loop = (lastRow_mut, assays_mut, contacts_mut, rowNumber_mut) => {
-    let prefix;
     loop:
       while (true) {
         const lastRow = lastRow_mut, assays = assays_mut, contacts = contacts_mut, rowNumber = rowNumber_mut;
-        let matchResult, prefix_2, prefix_3;
+        let prefix = void 0;
+        let matchResult = void 0, prefix_2 = void 0, prefix_3 = void 0;
         if (lastRow != null) {
           if (prefix = value(lastRow), prefix === "ASSAY" ? true : prefix === "ASSAY METADATA") {
             matchResult = 0;
@@ -56,7 +56,7 @@ function ArcAssay_fromRows(rows) {
             continue loop;
           }
           default: {
-            let matchResult_1, assays_2, contacts_2;
+            let matchResult_1 = void 0, assays_2 = void 0, contacts_2 = void 0;
             if (isEmpty(assays)) {
               if (isEmpty(contacts)) {
                 matchResult_1 = 0;
@@ -87,7 +87,7 @@ function ArcAssay_fromRows(rows) {
   if (en["System.Collections.IEnumerator.MoveNext"]()) {
     return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), empty(), 1);
   } else {
-    throw new Error("empty assay metadata sheet");
+    throw new Exception("empty assay metadata sheet");
   }
 }
 function ArcAssay_toRows(assay) {
@@ -103,7 +103,7 @@ function ArcAssay_toMetadataSheet(assay) {
 function ArcAssay_fromMetadataSheet(sheet) {
   try {
     const rows = map(SparseRowModule_fromFsRow, sheet.Rows);
-    const hasPrefix = exists((row) => {
+    exists((row) => {
       const s = head(row)[1];
       return s.startsWith("Assay");
     }, rows);
@@ -166,10 +166,11 @@ function ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(assay, datamapS
   const metadataSheet = ArcAssay_toMetadataSheet(assay);
   doc.AddWorksheet(metadataSheet);
   if (datamapSheet_1) {
-    iterate((arg) => {
-      const sheet = toFsWorksheet(arg);
+    const option_1 = assay.Datamap;
+    if (option_1 != null) {
+      const sheet = toFsWorksheet(value(option_1));
       doc.AddWorksheet(sheet);
-    }, toArray(assay.Datamap));
+    }
   }
   iterateIndexed((i, arg_1) => {
     const sheet_1 = toFsWorksheet$1(i, arg_1);

package/dist/ts/ts/Spreadsheet/ArcInvestigation.d.ts

@@ -1,17 +1,17 @@
-import { Record } from '@fable-org/fable-library-js/Types.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { Remark, Comment$ } from '../Core/Comment.js';
-import { IEnumerator, IEquatable } from '@fable-org/fable-library-js/Util.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { SparseTable } from './Metadata/SparseTable.js';
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { ArcAssay, ArcStudy, ArcInvestigation } from '../Core/ArcTypes.js';
-import { OntologySourceReference } from '../Core/OntologySourceReference.js';
-import { Publication } from '../Core/Publication.js';
-import { Person } from '../Core/Person.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { Record } from '@fable-org/fable-library-ts/Types.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { Remark, Comment$ } from '../Core/Comment.ts';
+import { IEnumerator, IEquatable } from '@fable-org/fable-library-ts/Util.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { SparseTable } from './Metadata/SparseTable.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { ArcAssay, ArcStudy, ArcInvestigation } from '../Core/ArcTypes.ts';
+import { OntologySourceReference } from '../Core/OntologySourceReference.ts';
+import { Publication } from '../Core/Publication.ts';
+import { Person } from '../Core/Person.ts';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 export declare class ArcInvestigation_InvestigationInfo extends Record implements IEquatable<ArcInvestigation_InvestigationInfo> {
     readonly Identifier: string;
     readonly Title: string;

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

@@ -1 +1 @@
-{"version":3,"file":"ArcInvestigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcInvestigation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ArcInvestigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcInvestigation.ts"],"names":[],"mappings":"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"}

package/dist/ts/ts/Spreadsheet/ArcInvestigation.js

@@ -1,24 +1,24 @@
-import { Record } from '../../node_modules/@fable-org/fable-library-js/Types.js';
-import { ofArray, map, empty, cons, reverse, unzip, concat, append, ofSeq, isEmpty as isEmpty$1, tail, head } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { Record } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { ofArray, map, empty, cons, reverse, unzip, concat, append, ofSeq, isEmpty as isEmpty$1, tail, head } from '../../node_modules/@fable-org/fable-library-ts/List.js';
 import { Comment$_$reflection, Remark } from '../Core/Comment.js';
-import { stringHash, getEnumerator, comparePrimitives } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { record_type, string_type, list_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { stringHash, Exception, getEnumerator, comparePrimitives } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { record_type, string_type, list_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { Comment_fromString, Comment_toString, Remark_wrapRemark } from './Metadata/Comment.js';
 import { SparseTable__TryGetValueDefault_5BAE6133, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1, SparseRowModule_tryGetValueAt, SparseRowModule_fromValues, SparseRowModule_getAllValues, SparseRowModule_fromAllValues, SparseRowModule_fromFsRow, SparseRowModule_writeToSheet } from './Metadata/SparseTable.js';
-import { addToDict } from '../../node_modules/@fable-org/fable-library-js/MapUtil.js';
-import { defaultArg, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { addToDict } from '../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
+import { defaultArg, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { ResizeArray_iter, Option_fromValueWithDefault } from '../Core/Helper/Collections.js';
-import { List_distinct, List_distinctBy } from '../../node_modules/@fable-org/fable-library-js/Seq2.js';
+import { List_distinct, List_distinctBy } from '../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { ArcInvestigation, ArcStudy } from '../Core/ArcTypes.js';
-import { isEmpty, delay, append as append$1, singleton, collect, toList, map as map$1, tryFind as tryFind$1, iterateIndexed } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { isEmpty, delay, append as append$1, singleton, collect, toList, map as map$1, tryFind as tryFind$1, iterateIndexed } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { fromRows as fromRows$3, toRows } from './Metadata/OntologySourceReference.js';
 import { fromRows as fromRows$2, toRows as toRows$1 } from './Metadata/Publication.js';
 import { fromRows as fromRows$1, toRows as toRows$2 } from './Metadata/Contacts.js';
 import { fromRows, toRows as toRows$3 } from './Metadata/Study.js';
-import { ofList, tryFind } from '../../node_modules/@fable-org/fable-library-js/Map.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
-import { toFail, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { ofList, tryFind } from '../../node_modules/@fable-org/fable-library-ts/Map.js';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
+import { toFail, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 
 class ArcInvestigation_InvestigationInfo extends Record {
   constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {
@@ -60,7 +60,7 @@ function ArcInvestigation_InvestigationInfo_ToSparseTable_Z720BD3FF(investigatio
   }, investigation.Comments);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
     Equals: (x, y) => x === y,
-    GetHashCode: stringHash
+    GetHashCode: (x) => stringHash(x) | 0
   })), matrix.ColumnCount);
 }
 function ArcInvestigation_InvestigationInfo_fromRows(lineNumber, rows) {
@@ -88,7 +88,7 @@ function ArcInvestigation_fromParts(investigationInfo, ontologySourceReference,
 }
 function ArcInvestigation_fromRows(rows) {
   if (isEmpty(rows)) {
-    throw new Error("isa_investigation sheet in Investigation file is empty");
+    throw new Exception("isa_investigation sheet in Investigation file is empty");
   }
   const en = getEnumerator(rows);
   const emptyInvestigationInfo = ArcInvestigation_InvestigationInfo_create("", "", "", "", "", empty());
@@ -96,7 +96,7 @@ function ArcInvestigation_fromRows(rows) {
     loop:
       while (true) {
         const lastLine = lastLine_mut, ontologySourceReferences = ontologySourceReferences_mut, investigationInfo = investigationInfo_mut, publications = publications_mut, contacts = contacts_mut, studies = studies_mut, remarks = remarks_mut, lineNumber = lineNumber_mut;
-        let matchResult, k_5, k_6, k_7, k_8, k_9;
+        let matchResult = void 0, k_5 = void 0, k_6 = void 0, k_7 = void 0, k_8 = void 0, k_9 = void 0;
         if (lastLine != null) {
           switch (value(lastLine)) {
             case "ONTOLOGY SOURCE REFERENCE": {
@@ -223,7 +223,7 @@ function ArcInvestigation_fromRows(rows) {
               const tupledArg = unzip(studies);
               patternInput_5 = [reverse(tupledArg[0]), List_distinctBy((a_1) => a_1.Identifier, concat(tupledArg[1]), {
                 Equals: (x, y) => x === y,
-                GetHashCode: stringHash
+                GetHashCode: (x) => stringHash(x) | 0
               })];
               return ArcInvestigation_fromParts(investigationInfo, ontologySourceReferences, publications, contacts, patternInput_5[0], patternInput_5[1], remarks);
             }
@@ -235,19 +235,19 @@ function ArcInvestigation_fromRows(rows) {
   en["System.Collections.IEnumerator.MoveNext"]();
   arcInvestigation = loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), emptyInvestigationInfo, empty(), empty(), empty(), empty(), 1);
   if (arcInvestigation.Identifier === "") {
-    throw new Error("Mandatory Investigation identifier is not present");
+    throw new Exception("Mandatory Investigation identifier is not present");
   }
   return arcInvestigation;
 }
 function ArcInvestigation_toRows(investigation) {
-  let remarks, rows;
+  let remarks = void 0, rows = void 0;
   return remarks = ofSeq(investigation.Remarks), rows = delay(() => append$1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append$1(toRows(ofSeq(investigation.OntologySourceReferences)), delay(() => append$1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append$1(ArcInvestigation_InvestigationInfo_toRows_Z720BD3FF(investigation), delay(() => append$1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append$1(toRows$1("Investigation Publication", ofSeq(investigation.Publications)), delay(() => append$1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append$1(toRows$2("Investigation Person", ofSeq(investigation.Contacts)), delay(() => collect((studyIdentifier) => {
     const study = defaultArg(investigation.TryGetStudy(studyIdentifier), new ArcStudy(studyIdentifier));
     return append$1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows$3(study, void 0)));
   }, investigation.RegisteredStudyIdentifiers)))))))))))))))))), (() => {
     try {
       const rm = ofList(map((remark) => Remark.toTuple(remark), remarks), {
-        Compare: comparePrimitives
+        Compare: (x, y) => comparePrimitives(x, y) | 0
       });
       const loop = (i_mut, l_mut, nl_mut) => {
         loop:
@@ -299,10 +299,10 @@ function ArcInvestigation_tryGetMetadataSheet(doc) {
   return tryFind$1(ArcInvestigation_isMetadataSheet, doc.GetWorksheets());
 }
 function ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D(doc) {
-  let sheet_1, matchValue;
+  let sheet_1 = void 0, matchValue = void 0;
   try {
     return ArcInvestigation_fromRows(map$1(SparseRowModule_fromFsRow, (sheet_1 = (matchValue = ArcInvestigation_tryGetMetadataSheet(doc), matchValue == null ? (() => {
-      throw new Error('Could not find metadata sheet with sheetname "isa_investigation" or deprecated sheetname "Investigation"');
+      throw new Exception('Could not find metadata sheet with sheetname "isa_investigation" or deprecated sheetname "Investigation"');
     })() : value(matchValue)), FsWorksheet.getRows(sheet_1))));
   } catch (err) {
     const arg = err.message;

package/dist/ts/ts/Spreadsheet/ArcRun.d.ts

@@ -1,8 +1,8 @@
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { ArcRun } from '../Core/ArcTypes.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { ArcRun } from '../Core/ArcTypes.ts';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 export declare function ArcRun_fromRows(rows: Iterable<Iterable<[int32, string]>>): ArcRun;
 export declare function ArcRun_toRows(run: ArcRun): Iterable<Iterable<[int32, string]>>;
 export declare function ArcRun_toMetadataSheet(run: ArcRun): FsWorksheet;

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

@@ -1 +1 @@
-{"version":3,"file":"ArcRun.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcRun.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAoB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,OAAO,EAAE,WAAW,EAAE,MAAM,gEAAgE,CAAC;AAG7F,OAAO,EAAE,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAM3F,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CA8DjF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAE9E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAM/D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAQnE;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAE3F;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAQpG;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAE/E;AAED;;GAEG;AACH,wBAAgB,oDAAoD,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAwB5F;AAED;;GAEG;AACH,wBAAgB,mDAAmD,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAS3F;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAE5E"}
+{"version":3,"file":"ArcRun.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcRun.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAoB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAGrF,OAAO,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAMnF,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CA8DjF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAE9E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAM/D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAQnE;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAE3F;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAQpG;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAE/E;AAED;;GAEG;AACH,wBAAgB,oDAAoD,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAwB5F;AAED;;GAEG;AACH,wBAAgB,mDAAmD,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAS3F;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAE5E"}

package/dist/ts/ts/Spreadsheet/ArcRun.js

@@ -1,15 +1,15 @@
-import { getEnumerator } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { getEnumerator, Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { fromRows as fromRows$1, toRows } from './Metadata/Run.js';
-import { value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { empty, ofSeq } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { empty, ofSeq } from '../../node_modules/@fable-org/fable-library-ts/List.js';
 import { ArcRun } from '../Core/ArcTypes.js';
 import { fromRows, toRows as toRows$1 } from './Metadata/Contacts.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromValues, SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_getAllValues, SparseRowModule_fromAllValues } from './Metadata/SparseTable.js';
-import { delay, append, singleton, iterateIndexed, map, tryFind, choose, tryPick, isEmpty } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { delay, append, singleton, iterateIndexed, map, tryFind, choose, tryPick, isEmpty } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 import { tryFromFsWorksheet, toFsWorksheet } from './AnnotationTable/ArcTable.js';
 import { tryFromFsWorksheet as tryFromFsWorksheet$1 } from './DatamapTable/DatamapTable.js';
 
@@ -19,7 +19,7 @@ function ArcRun_fromRows(rows) {
     loop:
       while (true) {
         const lastRow = lastRow_mut, run = run_mut, performers = performers_mut, rowNumber = rowNumber_mut;
-        let matchResult, prefix_2, prefix_3;
+        let matchResult = void 0, prefix_2 = void 0, prefix_3 = void 0;
         if (lastRow != null) {
           switch (value(lastRow)) {
             case "RUN": {
@@ -70,7 +70,7 @@ function ArcRun_fromRows(rows) {
   if (en["System.Collections.IEnumerator.MoveNext"]()) {
     return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), void 0, empty(), 1);
   } else {
-    throw new Error("empty run metadata sheet");
+    throw new Exception("empty run metadata sheet");
   }
 }
 function ArcRun_toRows(run) {

package/dist/ts/ts/Spreadsheet/ArcStudy.d.ts

@@ -1,9 +1,9 @@
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { ArcAssay, ArcStudy } from '../Core/ArcTypes.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { ArcAssay, ArcStudy } from '../Core/ArcTypes.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 export declare function ArcStudy_toMetadataSheet(study: ArcStudy, assays: Option<FSharpList<ArcAssay>>): FsWorksheet;
 export declare function ArcStudy_fromRows(rows: Iterable<Iterable<[int32, string]>>): Option<[ArcStudy, FSharpList<ArcAssay>]>;
 export declare function ArcStudy_fromMetadataSheet(sheet: FsWorksheet): [ArcStudy, FSharpList<ArcAssay>];
@@ -22,5 +22,5 @@ export declare function ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D
  * If datamapSheet is true, the datamap will be written to a worksheet inside study workbook. Default: true
  */
 export declare function ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(study: ArcStudy, assays?: FSharpList<ArcAssay>, datamapSheet?: boolean): FsWorkbook;
-export declare function ARCtrl_ArcStudy__ArcStudy_ToFsWorkbook_257FC1F0(this$: ArcStudy, assays: Option<FSharpList<ArcAssay>>, datamapSheet: Option<boolean>): FsWorkbook;
+export declare function ARCtrl_ArcStudy__ArcStudy_ToFsWorkbook_257FC1F0(this$: ArcStudy, assays?: FSharpList<ArcAssay>, datamapSheet?: boolean): FsWorkbook;
 //# sourceMappingURL=ArcStudy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArcStudy.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcStudy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gEAAgE,CAAC;AAG7F,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAiD,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC9G,OAAO,EAAS,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAKxE,OAAO,EAAE,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAO3F,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,WAAW,CAO3G;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAIrH;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAQ/F;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAGvI;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAQhI;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAEjF;AAED;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAyB1H;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAgB1J;AAED,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAEhK"}
+{"version":3,"file":"ArcStudy.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Spreadsheet/ArcStudy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAGrF,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAwC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACrG,OAAO,EAAS,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAKxE,OAAO,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAOnF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,WAAW,CAO3G;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAIrH;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAQ/F;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAGvI;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAQhI;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAEjF;AAED;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAyB1H;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAiB1J;AAED,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAElJ"}

package/dist/ts/ts/Spreadsheet/ArcStudy.js

@@ -1,20 +1,20 @@
-import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorksheet.fs.js';
-import { iterateIndexed, append, map, tryFind, tryPick, iterate } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { FsWorksheet } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
+import { iterateIndexed, append, map, tryFind, tryPick } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_fromFsRow, SparseRowModule_getAllValues, SparseRowModule_fromAllValues } from './Metadata/SparseTable.js';
 import { toRows, fromRows } from './Metadata/Study.js';
 import { ArcStudy } from '../Core/ArcTypes.js';
-import { defaultArg, value, toArray, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { empty } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { getEnumerator } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { defaultArg, value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { empty } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { getEnumerator } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { toFail, printf, toConsole } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
-import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.0-alpha.1/FsWorkbook.fs.js';
+import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
 import { ResizeArray_choose, ResizeArray_isEmpty } from '../Core/Helper/Collections.js';
 import { tryFromFsWorksheet, toFsWorksheet as toFsWorksheet$1 } from './AnnotationTable/ArcTable.js';
 import { tryFromFsWorksheet as tryFromFsWorksheet$1, toFsWorksheet } from './DatamapTable/DatamapTable.js';
 
 function ArcStudy_toMetadataSheet(study, assays) {
-  let source_1;
+  let source_1 = void 0;
   const sheet = new FsWorksheet("isa_study");
   iterateIndexed((rowI, r) => {
     SparseRowModule_writeToSheet(rowI + 1, r, sheet);
@@ -35,7 +35,7 @@ function ArcStudy_fromMetadataSheet(sheet) {
   }
 }
 function ArcStudy_toMetadataCollection(study, assays) {
-  let source_1;
+  let source_1 = void 0;
   return map(SparseRowModule_getAllValues, (source_1 = toRows(study, assays), append([SparseRowModule_fromValues(["STUDY"])], source_1)));
 }
 function ArcStudy_fromMetadataCollection(collection) {
@@ -89,10 +89,11 @@ function ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(study, assays,
   const metadataSheet = ArcStudy_toMetadataSheet(study, assays);
   doc.AddWorksheet(metadataSheet);
   if (datamapSheet_1) {
-    iterate((arg) => {
-      const sheet = toFsWorksheet(arg);
+    const option_1 = study.Datamap;
+    if (option_1 != null) {
+      const sheet = toFsWorksheet(value(option_1));
       doc.AddWorksheet(sheet);
-    }, toArray(study.Datamap));
+    }
   }
   iterateIndexed((i, arg_1) => {
     const sheet_1 = toFsWorksheet$1(i, arg_1);