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

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

@@ -1,13 +1,13 @@
 import { sortBy, map, toArray } from "@fable-org/fable-library-js/Seq.js";
+import { Dictionary_tryFind, Dictionary_items } from "../../Core/Helper/Collections.js";
 import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { OntologyAnnotation_compressedDecoder, OntologyAnnotation_compressedEncoder } from "../OntologyAnnotation.js";
 import { int, object, array as array_2 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
-import { Dictionary_tryFind } from "../../Core/Helper/Collections.js";
 import { value as value_2 } from "@fable-org/fable-library-js/Option.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 export function arrayFromMap(otm) {
-    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], otm, {
+    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], Dictionary_items(otm), {
         Compare: comparePrimitives,
     })));
 }

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

@@ -1,5 +1,4 @@
-import { safeHash, equals } from "@fable-org/fable-library-js/Util.js";
-import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
+import { Dictionary_init } from "../../Core/Helper/Collections.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.3.0/Encode.fs.js";
 import { decoder as decoder_3, arrayFromMap, encoder as encoder_1 } from "../../Json/Table/CellTable.js";
 import { decoder as decoder_2, arrayFromMap as arrayFromMap_1, encoder as encoder_2 } from "../../Json/Table/OATable.js";
@@ -7,15 +6,9 @@ import { decoder as decoder_1, arrayFromMap as arrayFromMap_2, encoder as encode
 import { map } from "@fable-org/fable-library-js/Seq.js";
 import { object as object_1 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 export function encode(encoder, obj) {
-    const stringTable = new Map([]);
-    const oaTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
-    const cellTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
+    const stringTable = Dictionary_init();
+    const oaTable = Dictionary_init();
+    const cellTable = Dictionary_init();
     const object = encoder(stringTable, oaTable, cellTable, obj);
     toString(0, object);
     const values = [["cellTable", encoder_1(stringTable, oaTable, arrayFromMap(cellTable))], ["oaTable", encoder_2(stringTable, arrayFromMap_1(oaTable))], ["stringTable", encoder_3(arrayFromMap_2(stringTable))], ["object", object]];

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

@@ -212,7 +212,7 @@ export class LDLabProcess {
     }
     static genId(name, assayName, studyName) {
         let study_1, assay_1, assay, study;
-        return clean((assayName == null) ? ((studyName != null) ? ((study_1 = value(studyName), `#Process_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = value(assayName), `#Process_${assay_1}_${name}`)) : ((assay = value(assayName), (study = value(studyName), `#Process_${study}_${assay}_${name}`)))));
+        return clean((assayName == null) ? ((studyName != null) ? ((study_1 = value(studyName), `#Process_S_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = value(assayName), `#Process_A_${assay_1}_${name}`)) : ((assay = value(assayName), (study = 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) : value(id);

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

@@ -1,42 +1,18 @@
-import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
-import { stringHash, comparePrimitives, safeHash, disposeSafe, getEnumerator, defaultOf, structuralHash, equals } from "@fable-org/fable-library-js/Util.js";
-import { tryPick, sort, map, reduce, iterate } from "@fable-org/fable-library-js/Seq.js";
-import { getItemFromDict, tryGetValue, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
-import { toString, FSharpRef } from "@fable-org/fable-library-js/Types.js";
-import { defaultArg, unwrap, value as value_1, some } from "@fable-org/fable-library-js/Option.js";
 import { ActivePatterns_$007CRegex$007C_$007C } from "../Core/Helper/Regex.js";
+import { defaultArg, unwrap, value as value_5 } from "@fable-org/fable-library-js/Option.js";
+import { FSharpRef, toString } from "@fable-org/fable-library-js/Types.js";
 import { Uri } from "@fable-org/fable-library-js/Uri.js";
-import { Dictionary_addOrUpdate } from "../Core/Helper/Collections.js";
+import { defaultOf, stringHash, comparePrimitives, safeHash, disposeSafe, getEnumerator } from "@fable-org/fable-library-js/Util.js";
+import { tryGetValue, getItemFromDict, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
+import { tryPick, sort, map, reduce } from "@fable-org/fable-library-js/Seq.js";
+import { StringDictionary_ofSeq } from "../Core/Helper/Collections.js";
 import { hash as hash_2, mergeHashes, boxHashSeq } from "../Core/Helper/HashCodes.js";
 import { class_type } from "@fable-org/fable-library-js/Reflection.js";
-export function Dictionary_ofSeq(s) {
-    const dict = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: structuralHash,
-    });
-    iterate((tupledArg) => {
-        addToDict(dict, tupledArg[0], tupledArg[1]);
-    }, s);
-    return dict;
-}
-export function Dictionary_tryFind(key, dict) {
-    let patternInput;
-    let outArg = defaultOf();
-    patternInput = [tryGetValue(dict, key, new FSharpRef(() => outArg, (v) => {
-            outArg = v;
-        })), outArg];
-    if (patternInput[0]) {
-        return some(patternInput[1]);
-    }
-    else {
-        return undefined;
-    }
-}
 export const IRIHelper_compactIRIRegex = "(?<prefix>.*):(?<suffix>[^\\/][^\\/].*)";
 export function IRIHelper_$007CCompactIri$007C_$007C(termDefition) {
     const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(IRIHelper_compactIRIRegex, termDefition);
     if (activePatternResult != null) {
-        const result = value_1(activePatternResult);
+        const result = value_5(activePatternResult);
         return [(result.groups && result.groups.prefix) || "", (result.groups && result.groups.suffix) || ""];
     }
     else {
@@ -54,7 +30,7 @@ export function IRIHelper_combine(baseIRI, relative) {
 export function IRIHelper_combineOptional(baseIRI, relative) {
     if (baseIRI == null) {
         if (relative != null) {
-            const r_1 = value_1(relative);
+            const r_1 = value_5(relative);
             return r_1;
         }
         else {
@@ -62,23 +38,23 @@ export function IRIHelper_combineOptional(baseIRI, relative) {
         }
     }
     else if (relative == null) {
-        const b_1 = value_1(baseIRI);
+        const b_1 = value_5(baseIRI);
         return b_1;
     }
     else {
-        const b = value_1(baseIRI);
-        const r = value_1(relative);
+        const b = value_5(baseIRI);
+        const r = value_5(relative);
         return IRIHelper_combine(b, r);
     }
 }
 export class LDContext {
     constructor(mappings, baseContexts) {
-        this["baseContexts@54"] = defaultArg(baseContexts, []);
+        this["baseContexts@41"] = defaultArg(baseContexts, []);
         this.name = undefined;
-        this["mappings@58"] = ((mappings == null) ? (new Map([])) : value_1(mappings));
+        this["mappings@45"] = ((mappings == null) ? (new Map([])) : value_5(mappings));
         this.reverseMappings = (new Map([]));
         this.compactReverseMappings = (new Map([]));
-        let enumerator = getEnumerator(this["mappings@58"]);
+        let enumerator = getEnumerator(this["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -91,15 +67,15 @@ export 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;
@@ -111,7 +87,15 @@ export class LDContext {
     }
     AddMapping(term, definition) {
         const this$ = this;
-        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 {
+            addToDict(dict, key, value);
+        }
         this$.addReverseMapping(term, definition);
     }
     TryResolveTerm(term) {
@@ -131,11 +115,11 @@ export class LDContext {
         else {
             const p1Def = this$.TryResolveTerm(p1);
             const p2Def = this$.TryResolveTerm(p2);
-            return (p1Def == null) ? ((p2Def != null) && ((p2Def_2 = value_1(p2Def), p1 === p2Def_2))) : ((p2Def == null) ? ((p1Def_2 = value_1(p1Def), p1Def_2 === p2)) : ((p1Def_1 = value_1(p1Def), (p2Def_1 = value_1(p2Def), p1Def_1 === p2Def_1))));
+            return (p1Def == null) ? ((p2Def != null) && ((p2Def_2 = value_5(p2Def), p1 === p2Def_2))) : ((p2Def == null) ? ((p1Def_2 = value_5(p1Def), p1Def_2 === p2)) : ((p1Def_1 = value_5(p1Def), (p2Def_1 = value_5(p2Def), p1Def_1 === p2Def_1))));
         }
     }
     static fromMappingSeq(mappings) {
-        return new LDContext(Dictionary_ofSeq(mappings));
+        return new LDContext(StringDictionary_ofSeq(mappings));
     }
     static combine_InPlace(baseContext, specificContext) {
         void (specificContext.BaseContexts.push(baseContext));
@@ -146,12 +130,12 @@ export class LDContext {
     }
     static tryCombineOptional(baseContext, specificContext) {
         let s_1, f_1, f, s;
-        return (baseContext == null) ? ((specificContext != null) ? ((s_1 = value_1(specificContext), s_1)) : undefined) : ((specificContext == null) ? ((f_1 = value_1(baseContext), f_1)) : ((f = value_1(baseContext), (s = value_1(specificContext), LDContext.combine(f, s)))));
+        return (baseContext == null) ? ((specificContext != null) ? ((s_1 = value_5(specificContext), s_1)) : undefined) : ((specificContext == null) ? ((f_1 = value_5(baseContext), f_1)) : ((f = value_5(baseContext), (s = value_5(specificContext), LDContext.combine(f, s)))));
     }
     ShallowCopy() {
         const this$ = this;
         const newMappings = new Map([]);
-        let enumerator = getEnumerator(this$["mappings@58"]);
+        let enumerator = getEnumerator(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -161,12 +145,12 @@ export class LDContext {
         finally {
             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 = getEnumerator(this$["mappings@58"]);
+        let enumerator = getEnumerator(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -177,7 +161,7 @@ export class LDContext {
             disposeSafe(enumerator);
         }
         const newBaseContexts = [];
-        let enumerator_1 = getEnumerator(this$["baseContexts@54"]);
+        let enumerator_1 = getEnumerator(this$["baseContexts@41"]);
         try {
             while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                 const ctx = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -209,8 +193,8 @@ export class LDContext {
         }))) | 0;
         let nameHash;
         const matchValue = this$.Name;
-        nameHash = ((matchValue == null) ? 0 : stringHash(value_1(matchValue)));
-        const baseContextsHash = ((this$["baseContexts@54"].length === 0) ? 0 : reduce(mergeHashes, map(safeHash, this$["baseContexts@54"]))) | 0;
+        nameHash = ((matchValue == null) ? 0 : stringHash(value_5(matchValue)));
+        const baseContextsHash = ((this$["baseContexts@41"].length === 0) ? 0 : reduce(mergeHashes, map(safeHash, this$["baseContexts@41"]))) | 0;
         return mergeHashes(mergeHashes(mappingsHash, nameHash), baseContextsHash) | 0;
     }
     "System.ICloneable.Clone"() {
@@ -219,26 +203,70 @@ export class LDContext {
     }
     addReverseMapping(key, value) {
         const this$ = this;
-        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 {
+            addToDict(dict, key_1, value_1);
+        }
         const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value);
         if (activePatternResult != null) {
-            const prefix = value_1(activePatternResult)[0];
-            const suffix = value_1(activePatternResult)[1];
-            Dictionary_addOrUpdate(prefix, [suffix, key], this$.compactReverseMappings);
-            const matchValue = Dictionary_tryFind(prefix, this$["mappings@58"]);
+            const prefix = value_5(activePatternResult)[0];
+            const suffix = value_5(activePatternResult)[1];
+            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 {
+                addToDict(dict_1, key_2, value_2);
+            }
+            let matchValue;
+            let patternInput;
+            let outArg = defaultOf();
+            patternInput = [tryGetValue(this$["mappings@45"], prefix, new FSharpRef(() => outArg, (v) => {
+                    outArg = v;
+                })), outArg];
+            matchValue = (patternInput[0] ? patternInput[1] : undefined);
             if (matchValue == null) {
             }
             else {
-                Dictionary_addOrUpdate(IRIHelper_combine(value_1(matchValue), suffix), key, this$.reverseMappings);
+                const key_4 = IRIHelper_combine(value_5(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 {
+                    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 = defaultOf();
+            patternInput_1 = [tryGetValue(this$.compactReverseMappings, key, new 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 = value_1(matchValue_1)[1];
-                Dictionary_addOrUpdate(IRIHelper_combine(value, value_1(matchValue_1)[0]), term, this$.reverseMappings);
+                const term = value_5(matchValue_1)[1];
+                const key_6 = IRIHelper_combine(value, value_5(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 {
+                    addToDict(dict_5, key_6, value_4);
+                }
             }
         }
     }
@@ -246,20 +274,32 @@ export class LDContext {
         let prefix, suffix, d;
         const this$ = this;
         let definition;
-        const matchValue = Dictionary_tryFind(term, this$["mappings@58"]);
-        definition = ((matchValue == null) ? tryPick((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@54"]) : value_1(matchValue));
+        let matchValue;
+        let patternInput;
+        let outArg = defaultOf();
+        patternInput = [tryGetValue(this$["mappings@45"], term, new FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        definition = ((matchValue == null) ? tryPick((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@41"]) : value_5(matchValue));
         if (definition == null) {
             return undefined;
         }
         else {
-            const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value_1(definition));
-            return (activePatternResult != null) ? ((prefix = value_1(activePatternResult)[0], (suffix = value_1(activePatternResult)[1], IRIHelper_combine((prefix === term) ? prefix : defaultArg(this$.tryFindTerm(prefix), prefix), (suffix === term) ? suffix : defaultArg(this$.tryFindTerm(suffix), suffix))))) : ((d = value_1(definition), d));
+            const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value_5(definition));
+            return (activePatternResult != null) ? ((prefix = value_5(activePatternResult)[0], (suffix = value_5(activePatternResult)[1], IRIHelper_combine((prefix === term) ? prefix : defaultArg(this$.tryFindTerm(prefix), prefix), (suffix === term) ? suffix : defaultArg(this$.tryFindTerm(suffix), suffix))))) : ((d = value_5(definition), d));
         }
     }
     tryFindIri(iri) {
         const this$ = this;
-        const matchValue = Dictionary_tryFind(iri, this$.reverseMappings);
-        return (matchValue == null) ? tryPick((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@54"]) : value_1(matchValue);
+        let matchValue;
+        let patternInput;
+        let outArg = defaultOf();
+        patternInput = [tryGetValue(this$.reverseMappings, iri, new FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        return (matchValue == null) ? tryPick((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@41"]) : value_5(matchValue);
     }
     tryCompactIRI(iri) {
         throw new Error("TryCompactIRI is Not implemented yet");

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

@@ -1,9 +1,11 @@
-import { iterateIndexed, length, sortBy, collect as collect_1, exists, toArray, ofArray, empty, tail, head, isEmpty, cons, singleton, fold, map, reverse } from "@fable-org/fable-library-js/List.js";
-import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
+import { iterateIndexed, length, ofSeq, sortBy, collect as collect_1, exists, toArray, ofArray, empty, tail, head, isEmpty, cons, singleton, fold, map, reverse } from "@fable-org/fable-library-js/List.js";
+import { unzip, item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { fold as fold_1, singleton as singleton_1, collect, map as map_2, delay, toArray as toArray_1, tryFind } from "@fable-org/fable-library-js/Seq.js";
 import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.3.1/FsWorksheet.fs.js";
 import { value as value_1 } from "@fable-org/fable-library-js/Option.js";
-import { toStringCellColumns, fixDeprecatedIOHeader, fromStringCellColumns } from "./CompositeColumn.js";
+import { toStringCellColumns, fixDeprecatedIOHeader, ColumnValueRefs_fromStringCellColumns, fromStringCellColumns } from "./CompositeColumn.js";
+import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
+import { ArcTableValues } from "../../Core/Table/ArcTableAux.js";
 import { printf, toFail } from "@fable-org/fable-library-js/String.js";
 import { Dictionary_tryGet, FsCellsCollection__TryGetCell_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.3.1/Cells/FsCellsCollection.fs.js";
 import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
@@ -11,7 +13,6 @@ import { FsAddress_$ctor_Z37302880, FsAddress__get_ColumnNumber, FsAddress__get_
 import { FsRangeAddress_$ctor_7E77A4A0, FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.3.1/Ranges/FsRangeAddress.fs.js";
 import { FsRangeBase__Cell_Z3407A44B, FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.3.1/Ranges/FsRangeBase.fs.js";
 import { ArcTable } from "../../Core/Table/ArcTable.js";
-import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { max } from "@fable-org/fable-library-js/Double.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 /**
@@ -81,6 +82,15 @@ export function tryAnnotationTable(sheet) {
 export function composeColumns(stringCellColumns) {
     return map_1(fromStringCellColumns, groupColumnsByHeader(stringCellColumns));
 }
+/**
+ * Groups and parses a collection of single columns into the according ISA composite columns
+ */
+export function composeArcTableValues(stringCellColumns) {
+    const valueMap = new Map([]);
+    const rowCount = (item(0, stringCellColumns).length - 1) | 0;
+    const patternInput = unzip(map_1((columns) => ColumnValueRefs_fromStringCellColumns(valueMap, columns), groupColumnsByHeader(stringCellColumns)));
+    return [patternInput[0], 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
  */
@@ -92,7 +102,7 @@ export function tryFromFsWorksheet(sheet) {
         }
         else {
             const t = value_1(matchValue);
-            const compositeColumns = composeColumns(map_1(fixDeprecatedIOHeader, toArray_1(delay(() => map_2((c) => toArray_1(delay(() => collect((r) => {
+            const patternInput = composeArcTableValues(map_1(fixDeprecatedIOHeader, toArray_1(delay(() => map_2((c) => toArray_1(delay(() => collect((r) => {
                 const matchValue_1 = FsCellsCollection__TryGetCell_Z37302880(sheet.CellCollection, r, c);
                 if (matchValue_1 == null) {
                     return singleton_1("");
@@ -102,7 +112,7 @@ export function tryFromFsWorksheet(sheet) {
                     return singleton_1(cell.ValueAsString());
                 }
             }, rangeDouble(1, 1, FsAddress__get_RowNumber(FsRangeAddress__get_LastAddress(FsRangeBase__get_RangeAddress(t))))))), rangeDouble(1, 1, FsAddress__get_ColumnNumber(FsRangeAddress__get_LastAddress(FsRangeBase__get_RangeAddress(t)))))))));
-            return ArcTable.addColumns(compositeColumns, undefined, true)(ArcTable.init(sheet.Name));
+            return ArcTable.fromArcTableValues(sheet.Name, Array.from(patternInput[0]), patternInput[1]);
         }
     }
     catch (err) {
@@ -118,7 +128,7 @@ export function toFsWorksheet(index, table) {
         return ws;
     }
     else {
-        const columns = collect_1(toStringCellColumns, sortBy(classifyColumnOrder, ofArray(table.Columns), {
+        const columns = collect_1(toStringCellColumns, sortBy(classifyColumnOrder, ofSeq(table.Columns), {
             Compare: comparePrimitives,
         }));
         let tableRowCount;

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

@@ -1,14 +1,18 @@
 import { tryItem, map, setItem, item, skip } from "@fable-org/fable-library-js/Array.js";
 import { CompositeHeader_Output, CompositeHeader_Input, IOType_Source, IOType } from "../../Core/Table/CompositeHeader.js";
-import { toString } from "@fable-org/fable-library-js/Types.js";
+import { FSharpRef, toString } from "@fable-org/fable-library-js/Types.js";
 import { toStringCells, fromStringCells } from "./CompositeHeader.js";
-import { singleton, append, toList, exists, map as map_1, delay, toArray } from "@fable-org/fable-library-js/Seq.js";
+import { reduce, singleton, append, toList, exists, map as map_1, delay, toArray } from "@fable-org/fable-library-js/Seq.js";
 import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
 import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
 import { FsCell } from "../../fable_modules/FsSpreadsheet.6.3.1/Cells/FsCell.fs.js";
 import { toStringCells as toStringCells_1 } from "./CompositeCell.js";
-import { defaultArg } from "@fable-org/fable-library-js/Option.js";
+import { value as value_1, defaultArg } from "@fable-org/fable-library-js/Option.js";
 import { map as map_2, singleton as singleton_1, ofArray } from "@fable-org/fable-library-js/List.js";
+import { defaultOf, stringHash } from "@fable-org/fable-library-js/Util.js";
+import { ColumnValueRefs_Constant, ensureCellHashInValueMap, ColumnValueRefs_Sparse } from "../../Core/Table/ArcTableAux.js";
+import { mergeHashes } from "../../Core/Helper/HashCodes.js";
+import { getItemFromDict, tryGetValue } from "@fable-org/fable-library-js/MapUtil.js";
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.
  *
@@ -38,9 +42,15 @@ export function fixDeprecatedIOHeader(stringCellCol) {
 export function fromStringCellColumns(columns) {
     const patternInput = fromStringCells(map((c) => item(0, c), columns));
     const l = item(0, columns).length | 0;
-    const cells = toArray(delay(() => map_1((i) => patternInput[1](map((c_1) => item(i, c_1), columns)), rangeDouble(1, 1, l - 1))));
+    const cells = Array.from(toArray(delay(() => map_1((i) => patternInput[1](map((c_1) => item(i, c_1), columns)), rangeDouble(1, 1, l - 1)))));
     return CompositeColumn.create(patternInput[0], cells);
 }
+export function stringCellColumnsOfFsColumns(columns) {
+    return map((c) => {
+        c.ToDenseColumn();
+        return map((cell) => cell.ValueAsString(), toArray(c.Cells));
+    }, columns);
+}
 export function fromFsColumns(columns) {
     return fromStringCellColumns(map((c) => {
         c.ToDenseColumn();
@@ -52,21 +62,80 @@ export function toStringCellColumns(column) {
     const isTerm = column.Header.IsTermColumn;
     const isData = column.Header.IsDataColumn && exists((c_1) => c_1.isData, column.Cells);
     const header = toStringCells(hasUnit, column.Header);
-    const cells = map((cell) => toStringCells_1(isTerm, hasUnit, cell), column.Cells);
+    const compositeCells = toArray(column.Cells);
+    const cells = map((cell) => toStringCells_1(isTerm, hasUnit, cell), toArray(column.Cells));
     const getCellOrDefault = (ri, ci, cells_1) => defaultArg(tryItem(ci, item(ri, cells_1)), "");
     if (hasUnit) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => getCellOrDefault(i, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => getCellOrDefault(i_1, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_2) => getCellOrDefault(i_2, 2, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => getCellOrDefault(i_3, 3, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => getCellOrDefault(i, 0, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => getCellOrDefault(i_1, 1, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_2) => getCellOrDefault(i_2, 2, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => getCellOrDefault(i_3, 3, cells), rangeDouble(0, 1, compositeCells.length - 1))))))]);
     }
     else if (isTerm) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => getCellOrDefault(i_4, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => getCellOrDefault(i_5, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => getCellOrDefault(i_6, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => getCellOrDefault(i_4, 0, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => getCellOrDefault(i_5, 1, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => getCellOrDefault(i_6, 2, cells), rangeDouble(0, 1, compositeCells.length - 1))))))]);
     }
     else if (isData) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => getCellOrDefault(i_7, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => getCellOrDefault(i_8, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => getCellOrDefault(i_9, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => getCellOrDefault(i_7, 0, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => getCellOrDefault(i_8, 1, cells), rangeDouble(0, 1, compositeCells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => getCellOrDefault(i_9, 2, cells), rangeDouble(0, 1, compositeCells.length - 1))))))]);
     }
     else {
-        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
+        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item(i_10, cells)), rangeDouble(0, 1, compositeCells.length - 1)))))));
     }
 }
 export function toFsColumns(column) {
     return map_2((c) => map_2((s) => (new FsCell(s)), c), toStringCellColumns(column));
 }
+export function ColumnValueRefs_fromStringCellColumns(valueMap, columns) {
+    let cellHash;
+    const hashMap = new Map([]);
+    const cells = new Map([]);
+    let constant = true;
+    const patternInput = fromStringCells(map((c) => item(0, c), columns));
+    const header = patternInput[0];
+    const cellParser = patternInput[1];
+    const l = item(0, columns).length | 0;
+    if (l === 1) {
+        return [header, ColumnValueRefs_Sparse(cells)];
+    }
+    else {
+        for (let i = 1; i <= (l - 1); i++) {
+            const strings = map((c_1) => item(i, c_1), columns);
+            const hash_2 = reduce(mergeHashes, map_1(stringHash, strings)) | 0;
+            let matchValue;
+            let patternInput_1;
+            let outArg = defaultOf();
+            patternInput_1 = [tryGetValue(hashMap, hash_2, new FSharpRef(() => outArg, (v) => {
+                    outArg = (v | 0);
+                })), outArg];
+            matchValue = (patternInput_1[0] ? patternInput_1[1] : undefined);
+            if (matchValue == null) {
+                if (i === 1) {
+                    const cellHash_3 = 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 = getItemFromDict(cells, 0) | 0;
+                            cells.set(j, cellHash_4);
+                        }
+                    }
+                    const cellHash_5 = ensureCellHashInValueMap(cellParser(strings), valueMap) | 0;
+                    hashMap.set(hash_2, cellHash_5);
+                    cells.set(i - 1, cellHash_5);
+                }
+            }
+            else if ((cellHash = (value_1(matchValue) | 0), constant)) {
+                const cellHash_1 = value_1(matchValue) | 0;
+            }
+            else {
+                const cellHash_2 = value_1(matchValue) | 0;
+                cells.set(i - 1, cellHash_2);
+            }
+        }
+        if (constant) {
+            return [header, ColumnValueRefs_Constant(getItemFromDict(cells, 0))];
+        }
+        else {
+            return [header, ColumnValueRefs_Sparse(cells)];
+        }
+    }
+}