@nfdi4plants/arctrl 3.0.0-alpha.3 → 3.0.0-beta.1

package/dist/ts/cjs/ts/Json/Table/OATable.js

@@ -6,15 +6,15 @@ exports.decoder = decoder;
 exports.encodeOA = encodeOA;
 exports.decodeOA = decodeOA;
 const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
+const Collections_js_1 = require("../../Core/Helper/Collections.js");
 const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
 const Array_js_1 = require("@fable-org/fable-library-js/Array.js");
 const OntologyAnnotation_js_1 = require("../OntologyAnnotation.js");
 const Decode_fs_js_1 = require("../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js");
-const Collections_js_1 = require("../../Core/Helper/Collections.js");
 const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
 function arrayFromMap(otm) {
-    return (0, Seq_js_1.toArray)((0, Seq_js_1.map)((kv_1) => kv_1[0], (0, Seq_js_1.sortBy)((kv) => kv[1], otm, {
+    return (0, Seq_js_1.toArray)((0, Seq_js_1.map)((kv_1) => kv_1[0], (0, Seq_js_1.sortBy)((kv) => kv[1], (0, Collections_js_1.Dictionary_items)(otm), {
         Compare: Util_js_1.comparePrimitives,
     })));
 }

package/dist/ts/cjs/ts/JsonIO/Table/Compression.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encode = encode;
 exports.decode = decode;
-const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
-const MutableMap_js_1 = require("@fable-org/fable-library-js/MutableMap.js");
+const Collections_js_1 = require("../../Core/Helper/Collections.js");
 const Encode_fs_js_1 = require("../../fable_modules/Thoth.Json.JavaScript.0.3.0/Encode.fs.js");
 const CellTable_js_1 = require("../../Json/Table/CellTable.js");
 const OATable_js_1 = require("../../Json/Table/OATable.js");
@@ -11,15 +10,9 @@ const StringTable_js_1 = require("../../Json/StringTable.js");
 const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const Decode_fs_js_1 = require("../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js");
 function encode(encoder, obj) {
-    const stringTable = new Map([]);
-    const oaTable = new MutableMap_js_1.Dictionary([], {
-        Equals: Util_js_1.equals,
-        GetHashCode: Util_js_1.safeHash,
-    });
-    const cellTable = new MutableMap_js_1.Dictionary([], {
-        Equals: Util_js_1.equals,
-        GetHashCode: Util_js_1.safeHash,
-    });
+    const stringTable = (0, Collections_js_1.Dictionary_init)();
+    const oaTable = (0, Collections_js_1.Dictionary_init)();
+    const cellTable = (0, Collections_js_1.Dictionary_init)();
     const object = encoder(stringTable, oaTable, cellTable, obj);
     (0, Encode_fs_js_1.toString)(0, object);
     const values = [["cellTable", (0, CellTable_js_1.encoder)(stringTable, oaTable, (0, CellTable_js_1.arrayFromMap)(cellTable))], ["oaTable", (0, OATable_js_1.encoder)(stringTable, (0, OATable_js_1.arrayFromMap)(oaTable))], ["stringTable", (0, StringTable_js_1.encoder)((0, StringTable_js_1.arrayFromMap)(stringTable))], ["object", object]];

package/dist/ts/cjs/ts/ROCrate/Generic/LabProcess.js

@@ -216,7 +216,7 @@ class LDLabProcess {
     }
     static genId(name, assayName, studyName) {
         let study_1, assay_1, assay, study;
-        return (0, Helper_js_1.clean)((assayName == null) ? ((studyName != null) ? ((study_1 = (0, Option_js_1.value)(studyName), `#Process_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = (0, Option_js_1.value)(assayName), `#Process_${assay_1}_${name}`)) : ((assay = (0, Option_js_1.value)(assayName), (study = (0, Option_js_1.value)(studyName), `#Process_${study}_${assay}_${name}`)))));
+        return (0, Helper_js_1.clean)((assayName == null) ? ((studyName != null) ? ((study_1 = (0, Option_js_1.value)(studyName), `#Process_S_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = (0, Option_js_1.value)(assayName), `#Process_A_${assay_1}_${name}`)) : ((assay = (0, Option_js_1.value)(assayName), (study = (0, Option_js_1.value)(studyName), `#Process_S_${study}_A_${assay}_${name}`)))));
     }
     static create(name, objects, results, id, agent, executesLabProtocol, parameterValues, endTime, disambiguatingDescriptions, context) {
         const id_1 = (id == null) ? LDLabProcess.genId(name) : (0, Option_js_1.value)(id);

package/dist/ts/cjs/ts/ROCrate/LDContext.js

@@ -1,47 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LDContext = exports.IRIHelper_compactIRIRegex = void 0;
-exports.Dictionary_ofSeq = Dictionary_ofSeq;
-exports.Dictionary_tryFind = Dictionary_tryFind;
 exports.IRIHelper_$007CCompactIri$007C_$007C = IRIHelper_$007CCompactIri$007C_$007C;
 exports.IRIHelper_combine = IRIHelper_combine;
 exports.IRIHelper_combineOptional = IRIHelper_combineOptional;
 exports.LDContext_$reflection = LDContext_$reflection;
 exports.LDContext_$ctor_7878CD77 = LDContext_$ctor_7878CD77;
-const MutableMap_js_1 = require("@fable-org/fable-library-js/MutableMap.js");
-const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
-const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
-const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
-const Types_js_1 = require("@fable-org/fable-library-js/Types.js");
-const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const Regex_js_1 = require("../Core/Helper/Regex.js");
+const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
+const Types_js_1 = require("@fable-org/fable-library-js/Types.js");
 const Uri_js_1 = require("@fable-org/fable-library-js/Uri.js");
+const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
+const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
+const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const Collections_js_1 = require("../Core/Helper/Collections.js");
 const HashCodes_js_1 = require("../Core/Helper/HashCodes.js");
 const Reflection_js_1 = require("@fable-org/fable-library-js/Reflection.js");
-function Dictionary_ofSeq(s) {
-    const dict = new MutableMap_js_1.Dictionary([], {
-        Equals: Util_js_1.equals,
-        GetHashCode: Util_js_1.structuralHash,
-    });
-    (0, Seq_js_1.iterate)((tupledArg) => {
-        (0, MapUtil_js_1.addToDict)(dict, tupledArg[0], tupledArg[1]);
-    }, s);
-    return dict;
-}
-function Dictionary_tryFind(key, dict) {
-    let patternInput;
-    let outArg = (0, Util_js_1.defaultOf)();
-    patternInput = [(0, MapUtil_js_1.tryGetValue)(dict, key, new Types_js_1.FSharpRef(() => outArg, (v) => {
-            outArg = v;
-        })), outArg];
-    if (patternInput[0]) {
-        return (0, Option_js_1.some)(patternInput[1]);
-    }
-    else {
-        return undefined;
-    }
-}
 exports.IRIHelper_compactIRIRegex = "(?<prefix>.*):(?<suffix>[^\\/][^\\/].*)";
 function IRIHelper_$007CCompactIri$007C_$007C(termDefition) {
     const activePatternResult = (0, Regex_js_1.ActivePatterns_$007CRegex$007C_$007C)(exports.IRIHelper_compactIRIRegex, termDefition);
@@ -83,12 +57,12 @@ function IRIHelper_combineOptional(baseIRI, relative) {
 }
 class LDContext {
     constructor(mappings, baseContexts) {
-        this["baseContexts@54"] = (0, Option_js_1.defaultArg)(baseContexts, []);
+        this["baseContexts@41"] = (0, Option_js_1.defaultArg)(baseContexts, []);
         this.name = undefined;
-        this["mappings@58"] = ((mappings == null) ? (new Map([])) : (0, Option_js_1.value)(mappings));
+        this["mappings@45"] = ((mappings == null) ? (new Map([])) : (0, Option_js_1.value)(mappings));
         this.reverseMappings = (new Map([]));
         this.compactReverseMappings = (new Map([]));
-        let enumerator = (0, Util_js_1.getEnumerator)(this["mappings@58"]);
+        let enumerator = (0, Util_js_1.getEnumerator)(this["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -101,15 +75,15 @@ class LDContext {
     }
     get Mappings() {
         const this$ = this;
-        return this$["mappings@58"];
+        return this$["mappings@45"];
     }
     get BaseContexts() {
         const this$ = this;
-        return this$["baseContexts@54"];
+        return this$["baseContexts@41"];
     }
     set BaseContexts(value) {
         const this$ = this;
-        this$["baseContexts@54"] = value;
+        this$["baseContexts@41"] = value;
     }
     get Name() {
         const this$ = this;
@@ -121,7 +95,15 @@ class LDContext {
     }
     AddMapping(term, definition) {
         const this$ = this;
-        (0, Collections_js_1.Dictionary_addOrUpdate)(term, definition, this$["mappings@58"]);
+        const key = term;
+        const value = definition;
+        const dict = this$["mappings@45"];
+        if (dict.has(key)) {
+            dict.set(key, value);
+        }
+        else {
+            (0, MapUtil_js_1.addToDict)(dict, key, value);
+        }
         this$.addReverseMapping(term, definition);
     }
     TryResolveTerm(term) {
@@ -145,7 +127,7 @@ class LDContext {
         }
     }
     static fromMappingSeq(mappings) {
-        return new LDContext(Dictionary_ofSeq(mappings));
+        return new LDContext((0, Collections_js_1.StringDictionary_ofSeq)(mappings));
     }
     static combine_InPlace(baseContext, specificContext) {
         void (specificContext.BaseContexts.push(baseContext));
@@ -161,7 +143,7 @@ class LDContext {
     ShallowCopy() {
         const this$ = this;
         const newMappings = new Map([]);
-        let enumerator = (0, Util_js_1.getEnumerator)(this$["mappings@58"]);
+        let enumerator = (0, Util_js_1.getEnumerator)(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -171,12 +153,12 @@ class LDContext {
         finally {
             (0, Util_js_1.disposeSafe)(enumerator);
         }
-        return new LDContext(newMappings, this$["baseContexts@54"]);
+        return new LDContext(newMappings, this$["baseContexts@41"]);
     }
     DeepCopy() {
         const this$ = this;
         const newMappings = new Map([]);
-        let enumerator = (0, Util_js_1.getEnumerator)(this$["mappings@58"]);
+        let enumerator = (0, Util_js_1.getEnumerator)(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -187,7 +169,7 @@ class LDContext {
             (0, Util_js_1.disposeSafe)(enumerator);
         }
         const newBaseContexts = [];
-        let enumerator_1 = (0, Util_js_1.getEnumerator)(this$["baseContexts@54"]);
+        let enumerator_1 = (0, Util_js_1.getEnumerator)(this$["baseContexts@41"]);
         try {
             while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                 const ctx = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -220,7 +202,7 @@ class LDContext {
         let nameHash;
         const matchValue = this$.Name;
         nameHash = ((matchValue == null) ? 0 : (0, Util_js_1.stringHash)((0, Option_js_1.value)(matchValue)));
-        const baseContextsHash = ((this$["baseContexts@54"].length === 0) ? 0 : (0, Seq_js_1.reduce)(HashCodes_js_1.mergeHashes, (0, Seq_js_1.map)(Util_js_1.safeHash, this$["baseContexts@54"]))) | 0;
+        const baseContextsHash = ((this$["baseContexts@41"].length === 0) ? 0 : (0, Seq_js_1.reduce)(HashCodes_js_1.mergeHashes, (0, Seq_js_1.map)(Util_js_1.safeHash, this$["baseContexts@41"]))) | 0;
         return (0, HashCodes_js_1.mergeHashes)((0, HashCodes_js_1.mergeHashes)(mappingsHash, nameHash), baseContextsHash) | 0;
     }
     "System.ICloneable.Clone"() {
@@ -229,26 +211,70 @@ class LDContext {
     }
     addReverseMapping(key, value) {
         const this$ = this;
-        (0, Collections_js_1.Dictionary_addOrUpdate)(value, key, this$.reverseMappings);
+        const key_1 = value;
+        const value_1 = key;
+        const dict = this$.reverseMappings;
+        if (dict.has(key_1)) {
+            dict.set(key_1, value_1);
+        }
+        else {
+            (0, MapUtil_js_1.addToDict)(dict, key_1, value_1);
+        }
         const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value);
         if (activePatternResult != null) {
             const prefix = (0, Option_js_1.value)(activePatternResult)[0];
             const suffix = (0, Option_js_1.value)(activePatternResult)[1];
-            (0, Collections_js_1.Dictionary_addOrUpdate)(prefix, [suffix, key], this$.compactReverseMappings);
-            const matchValue = Dictionary_tryFind(prefix, this$["mappings@58"]);
+            const key_2 = prefix;
+            const value_2 = [suffix, key];
+            const dict_1 = this$.compactReverseMappings;
+            if (dict_1.has(key_2)) {
+                dict_1.set(key_2, value_2);
+            }
+            else {
+                (0, MapUtil_js_1.addToDict)(dict_1, key_2, value_2);
+            }
+            let matchValue;
+            let patternInput;
+            let outArg = (0, Util_js_1.defaultOf)();
+            patternInput = [(0, MapUtil_js_1.tryGetValue)(this$["mappings@45"], prefix, new Types_js_1.FSharpRef(() => outArg, (v) => {
+                    outArg = v;
+                })), outArg];
+            matchValue = (patternInput[0] ? patternInput[1] : undefined);
             if (matchValue == null) {
             }
             else {
-                (0, Collections_js_1.Dictionary_addOrUpdate)(IRIHelper_combine((0, Option_js_1.value)(matchValue), suffix), key, this$.reverseMappings);
+                const key_4 = IRIHelper_combine((0, Option_js_1.value)(matchValue), suffix);
+                const value_3 = key;
+                const dict_3 = this$.reverseMappings;
+                if (dict_3.has(key_4)) {
+                    dict_3.set(key_4, value_3);
+                }
+                else {
+                    (0, MapUtil_js_1.addToDict)(dict_3, key_4, value_3);
+                }
             }
         }
         else {
-            const matchValue_1 = Dictionary_tryFind(key, this$.compactReverseMappings);
+            let matchValue_1;
+            let patternInput_1;
+            let outArg_1 = (0, Util_js_1.defaultOf)();
+            patternInput_1 = [(0, MapUtil_js_1.tryGetValue)(this$.compactReverseMappings, key, new Types_js_1.FSharpRef(() => outArg_1, (v_2) => {
+                    outArg_1 = v_2;
+                })), outArg_1];
+            matchValue_1 = (patternInput_1[0] ? patternInput_1[1] : undefined);
             if (matchValue_1 == null) {
             }
             else {
                 const term = (0, Option_js_1.value)(matchValue_1)[1];
-                (0, Collections_js_1.Dictionary_addOrUpdate)(IRIHelper_combine(value, (0, Option_js_1.value)(matchValue_1)[0]), term, this$.reverseMappings);
+                const key_6 = IRIHelper_combine(value, (0, Option_js_1.value)(matchValue_1)[0]);
+                const value_4 = term;
+                const dict_5 = this$.reverseMappings;
+                if (dict_5.has(key_6)) {
+                    dict_5.set(key_6, value_4);
+                }
+                else {
+                    (0, MapUtil_js_1.addToDict)(dict_5, key_6, value_4);
+                }
             }
         }
     }
@@ -256,8 +282,14 @@ class LDContext {
         let prefix, suffix, d;
         const this$ = this;
         let definition;
-        const matchValue = Dictionary_tryFind(term, this$["mappings@58"]);
-        definition = ((matchValue == null) ? (0, Seq_js_1.tryPick)((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@54"]) : (0, Option_js_1.value)(matchValue));
+        let matchValue;
+        let patternInput;
+        let outArg = (0, Util_js_1.defaultOf)();
+        patternInput = [(0, MapUtil_js_1.tryGetValue)(this$["mappings@45"], term, new Types_js_1.FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        definition = ((matchValue == null) ? (0, Seq_js_1.tryPick)((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@41"]) : (0, Option_js_1.value)(matchValue));
         if (definition == null) {
             return undefined;
         }
@@ -268,8 +300,14 @@ class LDContext {
     }
     tryFindIri(iri) {
         const this$ = this;
-        const matchValue = Dictionary_tryFind(iri, this$.reverseMappings);
-        return (matchValue == null) ? (0, Seq_js_1.tryPick)((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@54"]) : (0, Option_js_1.value)(matchValue);
+        let matchValue;
+        let patternInput;
+        let outArg = (0, Util_js_1.defaultOf)();
+        patternInput = [(0, MapUtil_js_1.tryGetValue)(this$.reverseMappings, iri, new Types_js_1.FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        return (matchValue == null) ? (0, Seq_js_1.tryPick)((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@41"]) : (0, Option_js_1.value)(matchValue);
     }
     tryCompactIRI(iri) {
         throw new Error("TryCompactIRI is Not implemented yet");

package/dist/ts/cjs/ts/Spreadsheet/AnnotationTable/ArcTable.js

@@ -7,6 +7,7 @@ exports.classifyColumnOrder = classifyColumnOrder;
 exports.groupColumnsByHeader = groupColumnsByHeader;
 exports.tryAnnotationTable = tryAnnotationTable;
 exports.composeColumns = composeColumns;
+exports.composeArcTableValues = composeArcTableValues;
 exports.tryFromFsWorksheet = tryFromFsWorksheet;
 exports.toFsWorksheet = toFsWorksheet;
 const List_js_1 = require("@fable-org/fable-library-js/List.js");
@@ -15,6 +16,8 @@ const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const FsWorksheet_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/FsWorksheet.fs.js");
 const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const CompositeColumn_js_1 = require("./CompositeColumn.js");
+const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
+const ArcTableAux_js_1 = require("../../Core/Table/ArcTableAux.js");
 const String_js_1 = require("@fable-org/fable-library-js/String.js");
 const FsCellsCollection_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/Cells/FsCellsCollection.fs.js");
 const Range_js_1 = require("@fable-org/fable-library-js/Range.js");
@@ -22,7 +25,6 @@ const FsAddress_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/FsAdd
 const FsRangeAddress_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/Ranges/FsRangeAddress.fs.js");
 const FsRangeBase_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/Ranges/FsRangeBase.fs.js");
 const ArcTable_js_1 = require("../../Core/Table/ArcTable.js");
-const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
 const Double_js_1 = require("@fable-org/fable-library-js/Double.js");
 const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
 /**
@@ -92,6 +94,15 @@ function tryAnnotationTable(sheet) {
 function composeColumns(stringCellColumns) {
     return (0, Array_js_1.map)(CompositeColumn_js_1.fromStringCellColumns, groupColumnsByHeader(stringCellColumns));
 }
+/**
+ * Groups and parses a collection of single columns into the according ISA composite columns
+ */
+function composeArcTableValues(stringCellColumns) {
+    const valueMap = new Map([]);
+    const rowCount = ((0, Array_js_1.item)(0, stringCellColumns).length - 1) | 0;
+    const patternInput = (0, Array_js_1.unzip)((0, Array_js_1.map)((columns) => (0, CompositeColumn_js_1.ColumnValueRefs_fromStringCellColumns)(valueMap, columns), groupColumnsByHeader(stringCellColumns)));
+    return [patternInput[0], ArcTableAux_js_1.ArcTableValues.fromRefColumns(patternInput[1], valueMap, rowCount)];
+}
 /**
  * Returns the protocol described by the headers and a function for parsing the values of the matrix to the processes of this protocol
  */
@@ -103,7 +114,7 @@ function tryFromFsWorksheet(sheet) {
         }
         else {
             const t = (0, Option_js_1.value)(matchValue);
-            const compositeColumns = composeColumns((0, Array_js_1.map)(CompositeColumn_js_1.fixDeprecatedIOHeader, (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((c) => (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((r) => {
+            const patternInput = composeArcTableValues((0, Array_js_1.map)(CompositeColumn_js_1.fixDeprecatedIOHeader, (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((c) => (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((r) => {
                 const matchValue_1 = (0, FsCellsCollection_fs_js_1.FsCellsCollection__TryGetCell_Z37302880)(sheet.CellCollection, r, c);
                 if (matchValue_1 == null) {
                     return (0, Seq_js_1.singleton)("");
@@ -113,7 +124,7 @@ function tryFromFsWorksheet(sheet) {
                     return (0, Seq_js_1.singleton)(cell.ValueAsString());
                 }
             }, (0, Range_js_1.rangeDouble)(1, 1, (0, FsAddress_fs_js_1.FsAddress__get_RowNumber)((0, FsRangeAddress_fs_js_1.FsRangeAddress__get_LastAddress)((0, FsRangeBase_fs_js_1.FsRangeBase__get_RangeAddress)(t))))))), (0, Range_js_1.rangeDouble)(1, 1, (0, FsAddress_fs_js_1.FsAddress__get_ColumnNumber)((0, FsRangeAddress_fs_js_1.FsRangeAddress__get_LastAddress)((0, FsRangeBase_fs_js_1.FsRangeBase__get_RangeAddress)(t)))))))));
-            return ArcTable_js_1.ArcTable.addColumns(compositeColumns, undefined, true)(ArcTable_js_1.ArcTable.init(sheet.Name));
+            return ArcTable_js_1.ArcTable.fromArcTableValues(sheet.Name, Array.from(patternInput[0]), patternInput[1]);
         }
     }
     catch (err) {
@@ -129,7 +140,7 @@ function toFsWorksheet(index, table) {
         return ws;
     }
     else {
-        const columns = (0, List_js_1.collect)(CompositeColumn_js_1.toStringCellColumns, (0, List_js_1.sortBy)(classifyColumnOrder, (0, List_js_1.ofArray)(table.Columns), {
+        const columns = (0, List_js_1.collect)(CompositeColumn_js_1.toStringCellColumns, (0, List_js_1.sortBy)(classifyColumnOrder, (0, List_js_1.ofSeq)(table.Columns), {
             Compare: Util_js_1.comparePrimitives,
         }));
         let tableRowCount;

package/dist/ts/cjs/ts/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixDeprecatedIOHeader = fixDeprecatedIOHeader;
 exports.fromStringCellColumns = fromStringCellColumns;
+exports.stringCellColumnsOfFsColumns = stringCellColumnsOfFsColumns;
 exports.fromFsColumns = fromFsColumns;
 exports.toStringCellColumns = toStringCellColumns;
 exports.toFsColumns = toFsColumns;
+exports.ColumnValueRefs_fromStringCellColumns = ColumnValueRefs_fromStringCellColumns;
 const Array_js_1 = require("@fable-org/fable-library-js/Array.js");
 const CompositeHeader_js_1 = require("../../Core/Table/CompositeHeader.js");
 const Types_js_1 = require("@fable-org/fable-library-js/Types.js");
@@ -16,6 +18,10 @@ const FsCell_fs_js_1 = require("../../fable_modules/FsSpreadsheet.6.3.1/Cells/Fs
 const CompositeCell_js_1 = require("./CompositeCell.js");
 const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const List_js_1 = require("@fable-org/fable-library-js/List.js");
+const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
+const ArcTableAux_js_1 = require("../../Core/Table/ArcTableAux.js");
+const HashCodes_js_1 = require("../../Core/Helper/HashCodes.js");
+const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.
  *
@@ -45,9 +51,15 @@ function fixDeprecatedIOHeader(stringCellCol) {
 function fromStringCellColumns(columns) {
     const patternInput = (0, CompositeHeader_js_2.fromStringCells)((0, Array_js_1.map)((c) => (0, Array_js_1.item)(0, c), columns));
     const l = (0, Array_js_1.item)(0, columns).length | 0;
-    const cells = (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => patternInput[1]((0, Array_js_1.map)((c_1) => (0, Array_js_1.item)(i, c_1), columns)), (0, Range_js_1.rangeDouble)(1, 1, l - 1))));
+    const cells = Array.from((0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => patternInput[1]((0, Array_js_1.map)((c_1) => (0, Array_js_1.item)(i, c_1), columns)), (0, Range_js_1.rangeDouble)(1, 1, l - 1)))));
     return CompositeColumn_js_1.CompositeColumn.create(patternInput[0], cells);
 }
+function stringCellColumnsOfFsColumns(columns) {
+    return (0, Array_js_1.map)((c) => {
+        c.ToDenseColumn();
+        return (0, Array_js_1.map)((cell) => cell.ValueAsString(), (0, Seq_js_1.toArray)(c.Cells));
+    }, columns);
+}
 function fromFsColumns(columns) {
     return fromStringCellColumns((0, Array_js_1.map)((c) => {
         c.ToDenseColumn();
@@ -59,21 +71,80 @@ function toStringCellColumns(column) {
     const isTerm = column.Header.IsTermColumn;
     const isData = column.Header.IsDataColumn && (0, Seq_js_1.exists)((c_1) => c_1.isData, column.Cells);
     const header = (0, CompositeHeader_js_2.toStringCells)(hasUnit, column.Header);
-    const cells = (0, Array_js_1.map)((cell) => (0, CompositeCell_js_1.toStringCells)(isTerm, hasUnit, cell), column.Cells);
+    const compositeCells = (0, Seq_js_1.toArray)(column.Cells);
+    const cells = (0, Array_js_1.map)((cell) => (0, CompositeCell_js_1.toStringCells)(isTerm, hasUnit, cell), (0, Seq_js_1.toArray)(column.Cells));
     const getCellOrDefault = (ri, ci, cells_1) => (0, Option_js_1.defaultArg)((0, Array_js_1.tryItem)(ci, (0, Array_js_1.item)(ri, cells_1)), "");
     if (hasUnit) {
-        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => getCellOrDefault(i, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_1) => getCellOrDefault(i_1, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_2) => getCellOrDefault(i_2, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(3, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_3) => getCellOrDefault(i_3, 3, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1))))))]);
+        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => getCellOrDefault(i, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_1) => getCellOrDefault(i_1, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_2) => getCellOrDefault(i_2, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(3, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_3) => getCellOrDefault(i_3, 3, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1))))))]);
     }
     else if (isTerm) {
-        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_4) => getCellOrDefault(i_4, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_5) => getCellOrDefault(i_5, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_6) => getCellOrDefault(i_6, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1))))))]);
+        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_4) => getCellOrDefault(i_4, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_5) => getCellOrDefault(i_5, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_6) => getCellOrDefault(i_6, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1))))))]);
     }
     else if (isData) {
-        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_7) => getCellOrDefault(i_7, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_8) => getCellOrDefault(i_8, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_9) => getCellOrDefault(i_9, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1))))))]);
+        return (0, List_js_1.ofArray)([(0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_7) => getCellOrDefault(i_7, 0, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(1, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_8) => getCellOrDefault(i_8, 1, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))), (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(2, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_9) => getCellOrDefault(i_9, 2, cells), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1))))))]);
     }
     else {
-        return (0, List_js_1.singleton)((0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_10) => (0, Array_js_1.item)(0, (0, Array_js_1.item)(i_10, cells)), (0, Range_js_1.rangeDouble)(0, 1, column.Cells.length - 1)))))));
+        return (0, List_js_1.singleton)((0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, Array_js_1.item)(0, header)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_10) => (0, Array_js_1.item)(0, (0, Array_js_1.item)(i_10, cells)), (0, Range_js_1.rangeDouble)(0, 1, compositeCells.length - 1)))))));
     }
 }
 function toFsColumns(column) {
     return (0, List_js_1.map)((c) => (0, List_js_1.map)((s) => (new FsCell_fs_js_1.FsCell(s)), c), toStringCellColumns(column));
 }
+function ColumnValueRefs_fromStringCellColumns(valueMap, columns) {
+    let cellHash;
+    const hashMap = new Map([]);
+    const cells = new Map([]);
+    let constant = true;
+    const patternInput = (0, CompositeHeader_js_2.fromStringCells)((0, Array_js_1.map)((c) => (0, Array_js_1.item)(0, c), columns));
+    const header = patternInput[0];
+    const cellParser = patternInput[1];
+    const l = (0, Array_js_1.item)(0, columns).length | 0;
+    if (l === 1) {
+        return [header, (0, ArcTableAux_js_1.ColumnValueRefs_Sparse)(cells)];
+    }
+    else {
+        for (let i = 1; i <= (l - 1); i++) {
+            const strings = (0, Array_js_1.map)((c_1) => (0, Array_js_1.item)(i, c_1), columns);
+            const hash_2 = (0, Seq_js_1.reduce)(HashCodes_js_1.mergeHashes, (0, Seq_js_1.map)(Util_js_1.stringHash, strings)) | 0;
+            let matchValue;
+            let patternInput_1;
+            let outArg = (0, Util_js_1.defaultOf)();
+            patternInput_1 = [(0, MapUtil_js_1.tryGetValue)(hashMap, hash_2, new Types_js_1.FSharpRef(() => outArg, (v) => {
+                    outArg = (v | 0);
+                })), outArg];
+            matchValue = (patternInput_1[0] ? patternInput_1[1] : undefined);
+            if (matchValue == null) {
+                if (i === 1) {
+                    const cellHash_3 = (0, ArcTableAux_js_1.ensureCellHashInValueMap)(cellParser(strings), valueMap) | 0;
+                    hashMap.set(hash_2, cellHash_3);
+                    cells.set(i - 1, cellHash_3);
+                }
+                else {
+                    if (constant) {
+                        constant = false;
+                        for (let j = 0; j <= (i - 1); j++) {
+                            const cellHash_4 = (0, MapUtil_js_1.getItemFromDict)(cells, 0) | 0;
+                            cells.set(j, cellHash_4);
+                        }
+                    }
+                    const cellHash_5 = (0, ArcTableAux_js_1.ensureCellHashInValueMap)(cellParser(strings), valueMap) | 0;
+                    hashMap.set(hash_2, cellHash_5);
+                    cells.set(i - 1, cellHash_5);
+                }
+            }
+            else if ((cellHash = ((0, Option_js_1.value)(matchValue) | 0), constant)) {
+                const cellHash_1 = (0, Option_js_1.value)(matchValue) | 0;
+            }
+            else {
+                const cellHash_2 = (0, Option_js_1.value)(matchValue) | 0;
+                cells.set(i - 1, cellHash_2);
+            }
+        }
+        if (constant) {
+            return [header, (0, ArcTableAux_js_1.ColumnValueRefs_Constant)((0, MapUtil_js_1.getItemFromDict)(cells, 0))];
+        }
+        else {
+            return [header, (0, ArcTableAux_js_1.ColumnValueRefs_Sparse)(cells)];
+        }
+    }
+}

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

@@ -31,11 +31,11 @@ const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const Collections_js_1 = require("../Core/Helper/Collections.js");
 const Seq2_js_1 = require("@fable-org/fable-library-js/Seq2.js");
 const ArcTypes_js_1 = require("../Core/ArcTypes.js");
+const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const OntologySourceReference_js_1 = require("./Metadata/OntologySourceReference.js");
 const Publication_js_1 = require("./Metadata/Publication.js");
 const Contacts_js_1 = require("./Metadata/Contacts.js");
 const Study_js_1 = require("./Metadata/Study.js");
-const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const Map_js_1 = require("@fable-org/fable-library-js/Map.js");
 const FsWorksheet_fs_js_1 = require("../fable_modules/FsSpreadsheet.6.3.1/FsWorksheet.fs.js");
 const FsWorkbook_fs_js_1 = require("../fable_modules/FsSpreadsheet.6.3.1/FsWorkbook.fs.js");
@@ -108,6 +108,9 @@ function ArcInvestigation_fromParts(investigationInfo, ontologySourceReference,
     return ArcTypes_js_1.ArcInvestigation.make(investigationInfo.Identifier, title, description, submissionDate, publicReleaseDate, ontologySourceReferences, publications_1, contacts_1, assays_1, studies_1, [], [], registeredStudyIdentifiers, comments, remarks_1);
 }
 function ArcInvestigation_fromRows(rows) {
+    if ((0, Seq_js_1.isEmpty)(rows)) {
+        throw new Error("isa_investigation sheet in Investigation file is empty");
+    }
     const en = (0, Util_js_1.getEnumerator)(rows);
     const emptyInvestigationInfo = ArcInvestigation_InvestigationInfo_create("", "", "", "", "", (0, List_js_1.empty)());
     const loop = (lastLine_mut, ontologySourceReferences_mut, investigationInfo_mut, publications_mut, contacts_mut, studies_mut, remarks_mut, lineNumber_mut) => {
@@ -226,25 +229,38 @@ function ArcInvestigation_fromRows(rows) {
                         continue loop;
                     }
                 }
-                default: {
-                    let patternInput_5;
-                    const tupledArg = (0, List_js_1.unzip)(studies);
-                    patternInput_5 = [(0, List_js_1.reverse)(tupledArg[0]), (0, Seq2_js_1.List_distinctBy)((a_1) => a_1.Identifier, (0, List_js_1.concat)(tupledArg[1]), {
-                            Equals: (x, y) => (x === y),
-                            GetHashCode: Util_js_1.stringHash,
-                        })];
-                    return ArcInvestigation_fromParts(investigationInfo, ontologySourceReferences, publications, contacts, patternInput_5[0], patternInput_5[1], remarks);
-                }
+                default:
+                    if (en["System.Collections.IEnumerator.MoveNext"]()) {
+                        lastLine_mut = (0, SparseTable_js_1.SparseRowModule_tryGetValueAt)(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]());
+                        ontologySourceReferences_mut = ontologySourceReferences;
+                        investigationInfo_mut = investigationInfo;
+                        publications_mut = publications;
+                        contacts_mut = contacts;
+                        studies_mut = studies;
+                        remarks_mut = remarks;
+                        lineNumber_mut = lineNumber;
+                        continue loop;
+                    }
+                    else {
+                        let patternInput_5;
+                        const tupledArg = (0, List_js_1.unzip)(studies);
+                        patternInput_5 = [(0, List_js_1.reverse)(tupledArg[0]), (0, Seq2_js_1.List_distinctBy)((a_1) => a_1.Identifier, (0, List_js_1.concat)(tupledArg[1]), {
+                                Equals: (x, y) => (x === y),
+                                GetHashCode: Util_js_1.stringHash,
+                            })];
+                        return ArcInvestigation_fromParts(investigationInfo, ontologySourceReferences, publications, contacts, patternInput_5[0], patternInput_5[1], remarks);
+                    }
             }
             break;
         }
     };
-    if (en["System.Collections.IEnumerator.MoveNext"]()) {
-        return loop((0, SparseTable_js_1.SparseRowModule_tryGetValueAt)(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), (0, List_js_1.empty)(), emptyInvestigationInfo, (0, List_js_1.empty)(), (0, List_js_1.empty)(), (0, List_js_1.empty)(), (0, List_js_1.empty)(), 1);
-    }
-    else {
-        throw new Error("emptyInvestigationFile");
+    let arcInvestigation;
+    en["System.Collections.IEnumerator.MoveNext"]();
+    arcInvestigation = loop((0, SparseTable_js_1.SparseRowModule_tryGetValueAt)(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), (0, List_js_1.empty)(), emptyInvestigationInfo, (0, List_js_1.empty)(), (0, List_js_1.empty)(), (0, List_js_1.empty)(), (0, List_js_1.empty)(), 1);
+    if (arcInvestigation.Identifier === "") {
+        throw new Error("Mandatory Investigation identifier is not present");
     }
+    return arcInvestigation;
 }
 function ArcInvestigation_toRows(investigation) {
     let remarks, rows;

package/dist/ts/cjs/ts/Spreadsheet/DataMapTable/DataMapHeader.js

@@ -476,5 +476,5 @@ function fromFsCells(cells) {
     }
 }
 function toFsCells(commentKeys) {
-    return (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Data"), new FsCell_fs_js_1.FsCell("Data Format"), new FsCell_fs_js_1.FsCell("Data Selector Format")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Explication"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Unit"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Object Type"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Description")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Generated By")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Label")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((ck) => (new FsCell_fs_js_1.FsCell(ck)), commentKeys)))))))))))))))));
+    return (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Data"), new FsCell_fs_js_1.FsCell("Data Format"), new FsCell_fs_js_1.FsCell("Data Selector Format")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Explication"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Unit"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Object Type"), new FsCell_fs_js_1.FsCell("Term Source REF"), new FsCell_fs_js_1.FsCell("Term Accession Number")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Description")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Generated By")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)([new FsCell_fs_js_1.FsCell("Label")], (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((ck) => (new FsCell_fs_js_1.FsCell(`Comment [${ck}]`)), commentKeys)))))))))))))))));
 }

package/dist/ts/cjs/ts/Spreadsheet/Metadata/SparseTable.js

@@ -36,7 +36,7 @@ const Types_js_1 = require("@fable-org/fable-library-js/Types.js");
 const Reflection_js_1 = require("@fable-org/fable-library-js/Reflection.js");
 const CollectionAux_js_1 = require("../CollectionAux.js");
 const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
-const MutableMap_js_1 = require("@fable-org/fable-library-js/MutableMap.js");
+const Collections_js_1 = require("../../Core/Helper/Collections.js");
 const String_js_1 = require("@fable-org/fable-library-js/String.js");
 const Comment_js_1 = require("../../Core/Comment.js");
 const Comment_js_2 = require("./Comment.js");
@@ -319,10 +319,7 @@ function SparseTable__TryGetValueDefault_5BAE6133(this$, defaultValue, key) {
     }
 }
 function SparseTable_Create_Z2192E64B(matrix, keys, commentKeys, length) {
-    return new SparseTable((0, Option_js_1.defaultArg)(matrix, new MutableMap_js_1.Dictionary([], {
-        Equals: Util_js_1.equalArrays,
-        GetHashCode: Util_js_1.arrayHash,
-    })), (0, Option_js_1.defaultArg)(keys, (0, List_js_1.empty)()), (0, Option_js_1.defaultArg)(commentKeys, (0, List_js_1.empty)()), (0, Option_js_1.defaultArg)(length, 0));
+    return new SparseTable((0, Option_js_1.defaultArg)(matrix, (0, Collections_js_1.Dictionary_init)()), (0, Option_js_1.defaultArg)(keys, (0, List_js_1.empty)()), (0, Option_js_1.defaultArg)(commentKeys, (0, List_js_1.empty)()), (0, Option_js_1.defaultArg)(length, 0));
 }
 function SparseTable_AddRow(key, values, matrix) {
     (0, Seq_js_1.iterate)((tupledArg) => {