@nfdi4plants/arctrl 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/ts/ts/Json/ROCrate/LDNode.js

@@ -1,16 +1,16 @@
 import { ErrorReason$1_BadOneOf, ErrorReason$1_BadPrimitive } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { resizeArrayOrSingleton, dateTime } from '../Encode.js';
-import { LDNode, LDValue, LDRef } from '../../ROCrate/LDObject.js';
-import { decoder as decoder$1, encoder as encoder$2 } from './LDValue.js';
-import { decoder as decoder$2, encoder as encoder$3 } from './LDRef.js';
-import { getEnumerator, disposeSafe, int32ToString, equals, defaultOf, isIterable } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
+import { dateTime, resizeArrayOrSingleton } from '../Encode.js';
+import { LDValue, LDRef, LDNode } from '../../ROCrate/LDObject.js';
+import { encoder as encoder$1, decoder as decoder$2 } from './LDValue.js';
+import { encoder as encoder$2, decoder as decoder$3 } from './LDRef.js';
+import { equals, defaultOf, isIterable, getEnumerator, disposeSafe, int32ToString } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
 import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
-import { toList, delay, map as map$1, append, singleton, empty, collect, enumerateFromFunctions } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { decoder as decoder$3, encoder as encoder$1 } from './LDContext.js';
-import { unwrap, value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { map, oneOf, string, int, decimal, Getters$2_$ctor_Z4BE6C149, Getters$2__get_Errors } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { toList, delay, map, enumerateFromFunctions, append, singleton, empty, collect } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { encoder as encoder$3, decoder as decoder$1 } from './LDContext.js';
+import { value, unwrap } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, map as map$1, oneOf, int, decimal } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { Decode_resizeArrayOrSingleton, Helpers_prependPath } from '../Decode.js';
-import { ofArray, isEmpty, length, head } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { isEmpty, length, head, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
 import { fold } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
 
@@ -48,10 +48,10 @@ function genericEncoder(obj) {
     return dateTime(d);
   } else if (obj instanceof LDValue) {
     const v = obj;
-    return encoder$2(v);
+    return encoder$1(v);
   } else if (obj instanceof LDRef) {
     const r = obj;
-    return encoder$3(r);
+    return encoder$2(r);
   } else if (obj instanceof LDNode) {
     const o = obj;
     return encoder(o);
@@ -63,7 +63,7 @@ function genericEncoder(obj) {
     };
   } else if (isIterable(obj)) {
     const l = obj;
-    return list(toList(delay(() => map$1(genericEncoder, enumerateFromFunctions(() => getEnumerator(l), (enumerator) => enumerator["System.Collections.IEnumerator.MoveNext"](), (enumerator_1) => enumerator_1["System.Collections.IEnumerator.get_Current"]())))));
+    return list(toList(delay(() => map(genericEncoder, enumerateFromFunctions(() => getEnumerator(l), (enumerator) => enumerator["System.Collections.IEnumerator.MoveNext"](), (enumerator_1) => enumerator_1["System.Collections.IEnumerator.get_Current"]())))));
   } else {
     throw new Error("Unknown type");
   }
@@ -85,7 +85,7 @@ function encoder(obj) {
       }
     }), obj.AdditionalType)]) : empty(), delay(() => {
       let matchValue;
-      return append((matchValue = obj.TryGetContext(), matchValue != null ? singleton(["@context", encoder$1(value(matchValue))]) : empty()), delay(() => collect((kv) => {
+      return append((matchValue = obj.TryGetContext(), matchValue != null ? singleton(["@context", encoder$3(value(matchValue))]) : empty()), delay(() => collect((kv) => {
         const l = kv[0].toLocaleLowerCase();
         return l !== "id" && l !== "schematype" && l !== "additionaltype" && l !== "@context" && !l.startsWith("init@") && !l.startsWith("init_") ? singleton([kv[0], genericEncoder(kv[1])]) : empty();
       }, obj.GetProperties(true))));
@@ -93,7 +93,7 @@ function encoder(obj) {
   }));
   return {
     Encode(helpers_3) {
-      const arg = map$1((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
+      const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
       return helpers_3.encodeObject(arg);
     }
   };
@@ -117,7 +117,7 @@ function getDecoder(expectObject) {
           id = objectArg_1.Field("@id", string);
           let context;
           const objectArg_2 = get$.Optional;
-          context = objectArg_2.Field("@context", decoder$3);
+          context = objectArg_2.Field("@context", decoder$1);
           const o = new LDNode(id, t, unwrap((arg_7 = Decode_resizeArrayOrSingleton(string), objectArg_3 = get$.Optional, objectArg_3.Field("additionalType", arg_7))));
           const enumerator = getEnumerator(properties);
           try {
@@ -177,14 +177,14 @@ function getDecoder(expectObject) {
       }
     };
     if (expectObject_1) {
-      return map((value_4) => value_4, decodeObject);
+      return map$1((value_4) => value_4, decodeObject);
     } else {
-      return oneOf(ofArray([map((value_5) => value_5, decoder$1), map((value_6) => value_6, decodeObject), map((value_7) => value_7, decoder$2), map((value_8) => value_8, resizeArray), map((value_9) => value_9, string), map((value_10) => value_10, int), map((value_11) => value_11, decimal)]));
+      return oneOf(ofArray([map$1((value_5) => value_5, decoder$2), map$1((value_6) => value_6, decodeObject), map$1((value_7) => value_7, decoder$3), map$1((value_8) => value_8, resizeArray), map$1((value_9) => value_9, string), map$1((value_10) => value_10, int), map$1((value_11) => value_11, decimal)]));
     }
   };
   return decode(expectObject);
 }
-const decoder = map((value) => value, getDecoder(true));
+const decoder = map$1((value) => value, getDecoder(true));
 const genericDecoder = getDecoder(false);
 
 export { decoder, encoder, genericDecoder, genericEncoder, getDecoder };

package/dist/ts/ts/Json/Run.d.ts

@@ -0,0 +1,11 @@
+import { Decoder$1, IEncodable } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
+import { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
+import { ArcRun } from '../Core/ArcTypes.js';
+import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { int32 } from '@fable-org/fable-library-js/Int32.js';
+import { CompositeCell_$union } from '../Core/Table/CompositeCell.js';
+export declare function encoder(run: ArcRun): IEncodable;
+export declare const decoder: Decoder$1<ArcRun>;
+export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, run: ArcRun): IEncodable;
+export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<ArcRun>;
+//# sourceMappingURL=Run.d.ts.map

package/dist/ts/ts/Json/Run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Run.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAG9G,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAUnE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAyB/C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,MAAM,CAGpC,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,CAyBnL;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAK5I"}

package/dist/ts/ts/Json/Run.js

@@ -0,0 +1,76 @@
+import { choose, ofArray } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { map, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { tryInclude, tryIncludeSeq } from './Encode.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder } from './OntologyAnnotation.js';
+import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$2 } from './DataMap/DataMap.js';
+import { encoder as encoder$2, decoder as decoder$1, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
+import { encoder as encoder$3, decoder as decoder$3 } from './Person.js';
+import { encoder as encoder$4, decoder as decoder$4 } from './Comment.js';
+import { map as map$1 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { ArcRun } from '../Core/ArcTypes.js';
+import { object, string, resizeArray } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+
+function encoder(run) {
+  let value;
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = run.Identifier, {
+    Encode(helpers) {
+      return helpers.encodeString(value);
+    }
+  })], tryInclude("Title", (value_1) => ({
+    Encode(helpers_1) {
+      return helpers_1.encodeString(value_1);
+    }
+  }), run.Title), tryInclude("Description", (value_3) => ({
+    Encode(helpers_2) {
+      return helpers_2.encodeString(value_3);
+    }
+  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("DataMap", encoder$1, run.DataMap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
+    Encode(helpers_3) {
+      return helpers_3.encodeString(value_5);
+    }
+  }), run.WorkflowIdentifiers), tryIncludeSeq("Tables", encoder$2, run.Tables), tryIncludeSeq("Performers", encoder$3, run.Performers), tryIncludeSeq("Comments", encoder$4, run.Comments)]));
+  return {
+    Encode(helpers_4) {
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
+      return helpers_4.encodeObject(arg);
+    }
+  };
+}
+const decoder = object((get$) => {
+  let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
+  return ArcRun.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoder$1), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("DataMap", decoder$2))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
+});
+function encoderCompressed(stringTable, oaTable, cellTable, run) {
+  let value;
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = run.Identifier, {
+    Encode(helpers) {
+      return helpers.encodeString(value);
+    }
+  })], tryInclude("Title", (value_1) => ({
+    Encode(helpers_1) {
+      return helpers_1.encodeString(value_1);
+    }
+  }), run.Title), tryInclude("Description", (value_3) => ({
+    Encode(helpers_2) {
+      return helpers_2.encodeString(value_3);
+    }
+  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("DataMap", (dm) => encoderCompressed$1(stringTable, oaTable, cellTable, dm), run.DataMap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
+    Encode(helpers_3) {
+      return helpers_3.encodeString(value_5);
+    }
+  }), run.WorkflowIdentifiers), tryIncludeSeq("Tables", (table) => encoderCompressed$2(stringTable, oaTable, cellTable, table), run.Tables), tryIncludeSeq("Performers", encoder$3, run.Performers), tryIncludeSeq("Comments", encoder$4, run.Comments)]));
+  return {
+    Encode(helpers_4) {
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
+      return helpers_4.encodeObject(arg);
+    }
+  };
+}
+function decoderCompressed(stringTable, oaTable, cellTable) {
+  return object((get$) => {
+    let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
+    return ArcRun.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((arg_17 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_8 = get$.Optional, objectArg_8.Field("DataMap", arg_17))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
+  });
+}
+
+export { decoder, decoderCompressed, encoder, encoderCompressed };

package/dist/ts/ts/Json/StringTable.js

@@ -1,4 +1,4 @@
-import { map, fill, item, setItem } from '../../node_modules/@fable-org/fable-library-js/Array.js';
+import { fill, setItem, map, item } from '../../node_modules/@fable-org/fable-library-js/Array.js';
 import { iterate } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { defaultOf } from '../../node_modules/@fable-org/fable-library-js/Util.js';
 import { array, string, int } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';

package/dist/ts/ts/Json/Study.js

@@ -1,23 +1,23 @@
-import { Option_fromValueWithDefault, ResizeArray_map } from '../Core/Helper/Collections.js';
-import { defaultArgWith, map, value, defaultArg, unwrap, bind } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { ofArray, map as map$1, empty, choose, singleton, tryFind } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { ArcStudy, ArcAssay } from '../Core/ArcTypes.js';
+import { ResizeArray_map, Option_fromValueWithDefault } from '../Core/Helper/Collections.js';
+import { defaultArg, value, map, unwrap, bind, defaultArgWith } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { tryFind, choose, ofArray, singleton, map as map$2, empty } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { ArcAssay, ArcStudy } from '../Core/ArcTypes.js';
 import { tryInclude, tryIncludeSeq, tryIncludeList } from './Encode.js';
-import { ISAJson_decoder as ISAJson_decoder$2, decoder as decoder$1, ROCrate_decoder as ROCrate_decoder$2, encoder as encoder$1, ROCrate_encoder as ROCrate_encoder$1, ISAJson_encoder as ISAJson_encoder$2 } from './Publication.js';
-import { ISAJson_decoder as ISAJson_decoder$5, decoder as decoder$2, ROCrate_decoder as ROCrate_decoder$3, encoder as encoder$2, ROCrate_encoder as ROCrate_encoder$2, ISAJson_encoder as ISAJson_encoder$3 } from './Person.js';
-import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_encoder, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ISAJson_encoder } from './OntologyAnnotation.js';
-import { decoder as decoder$3, decoderCompressed as decoderCompressed$1, encoder as encoder$3, encoderCompressed as encoderCompressed$1 } from './Table/ArcTable.js';
-import { decoder as decoder$4, decoderCompressed as decoderCompressed$2, encoder as encoder$4, encoderCompressed as encoderCompressed$2 } from './DataMap/DataMap.js';
-import { ISAJson_decoder as ISAJson_decoder$3, decoder as decoder$5, ROCrate_decoder as ROCrate_decoder$4, encoder as encoder$5, ROCrate_encoder as ROCrate_encoder$6, ISAJson_encoder as ISAJson_encoder$6 } from './Comment.js';
-import { isEmpty, map as map$2 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { string, list, resizeArray, object } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$4 } from './Publication.js';
+import { encoder as encoder$2, decoder as decoder$2, ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$4, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$3 } from './Person.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from './OntologyAnnotation.js';
+import { encoder as encoder$3, decoder as decoder$3, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
+import { encoder as encoder$4, decoder as decoder$4, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './DataMap/DataMap.js';
+import { encoder as encoder$5, decoder as decoder$5, ROCrate_encoder as ROCrate_encoder$6, ROCrate_decoder as ROCrate_decoder$5, ISAJson_encoder as ISAJson_encoder$6, ISAJson_decoder as ISAJson_decoder$5 } from './Comment.js';
+import { map as map$1, isEmpty } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { object, string, resizeArray, list as list$1 } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { getEnumerator, disposeSafe } from '../../node_modules/@fable-org/fable-library-js/Util.js';
 import { replace } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { createMissingIdentifier, Study_tryIdentifierFromFileName, Study_tryFileNameFromIdentifier, Study_fileNameFromIdentifier } from '../Core/Helper/Identifier.js';
-import { ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D, Person_getSourceAssayIdentifiersFromComments, Person_removeSourceAssayComments, ARCtrl_ArcTables__ArcTables_GetProcesses, Person_setSourceAssayComment } from '../Core/Conversion.js';
-import { list as list$1 } from '../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
-import { ISAJson_decoder as ISAJson_decoder$1, ROCrate_decoder as ROCrate_decoder$1, ROCrate_encoder as ROCrate_encoder$3, ISAJson_encoder as ISAJson_encoder$4 } from './Process/Process.js';
-import { ISAJson_decoder as ISAJson_decoder$4, ROCrate_decoder as ROCrate_decoder$5, ROCrate_encoder as ROCrate_encoder$4, ISAJson_encoder as ISAJson_encoder$5 } from './Assay.js';
+import { Study_tryFileNameFromIdentifier, Study_tryIdentifierFromFileName, createMissingIdentifier, Study_fileNameFromIdentifier } from '../Core/Helper/Identifier.js';
+import { ARCtrl_ArcTables__ArcTables_GetProcesses, ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D, Person_setSourceAssayComment, Person_getSourceAssayIdentifiersFromComments, Person_removeSourceAssayComments } from '../Core/Conversion.js';
+import { list } from '../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { ROCrate_encoder as ROCrate_encoder$3, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$4, ISAJson_decoder as ISAJson_decoder$1 } from './Process/Process.js';
+import { ROCrate_encoder as ROCrate_encoder$4, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$5, ISAJson_decoder as ISAJson_decoder$2 } from './Assay.js';
 import { ROCrate_encoder as ROCrate_encoder$5 } from './Data.js';
 import { getData, getUnits, getFactors, getCharacteristics, getProtocols } from '../Core/Process/ProcessSequence.js';
 import { context_jsonvalue } from './context/rocrate/isa_study_context.js';
@@ -64,7 +64,7 @@ function encoder(study) {
   }), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", encoder$5, study.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
@@ -102,7 +102,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, study) {
   }), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", encoder$5, study.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
@@ -110,7 +110,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, study) {
 function decoderCompressed(stringTable, oaTable, cellTable) {
   return object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10, arg_23, objectArg_11;
-    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((arg_19 = decoderCompressed$2(), objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", arg_19))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
+    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((arg_19 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", arg_19))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
   });
 }
 function ROCrate_genID(a) {
@@ -122,7 +122,7 @@ function ROCrate_genID(a) {
   }
 }
 function ROCrate_encoder(assays, s) {
-  let value, value_3, studyName, studyName_1;
+  let value, value_3, studyName, assayName_1;
   const fileName = Study_tryFileNameFromIdentifier(s.Identifier);
   const processes = ARCtrl_ArcTables__ArcTables_GetProcesses(s);
   const assays_1 = Helper_getAssayInformation(assays, s);
@@ -130,7 +130,7 @@ function ROCrate_encoder(assays, s) {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
-  })], ["@type", list$1(singleton({
+  })], ["@type", list(singleton({
     Encode(helpers_1) {
       return helpers_1.encodeString("Study");
     }
@@ -162,10 +162,10 @@ function ROCrate_encoder(assays, s) {
     Encode(helpers_8) {
       return helpers_8.encodeString(value_12);
     }
-  }), s.PublicReleaseDate), tryIncludeSeq("publications", ROCrate_encoder$1, s.Publications), tryIncludeSeq("people", ROCrate_encoder$2, s.Contacts), tryIncludeList("processSequence", (studyName = s.Identifier, (oa_3) => ROCrate_encoder$3(studyName, void 0, oa_3)), processes), tryIncludeSeq("assays", (studyName_1 = s.Identifier, (a_1) => ROCrate_encoder$4(studyName_1, a_1)), assays_1), tryIncludeList("dataFiles", ROCrate_encoder$5, getData(processes)), tryIncludeSeq("comments", ROCrate_encoder$6, s.Comments), ["@context", context_jsonvalue]]));
+  }), s.PublicReleaseDate), tryIncludeSeq("publications", ROCrate_encoder$1, s.Publications), tryIncludeSeq("people", ROCrate_encoder$2, s.Contacts), tryIncludeList("processSequence", (studyName = s.Identifier, (oa_3) => ROCrate_encoder$3(studyName, void 0, oa_3)), processes), tryIncludeSeq("assays", (assayName_1 = s.Identifier, (a_1) => ROCrate_encoder$4(assayName_1, a_1)), assays_1), tryIncludeList("dataFiles", ROCrate_encoder$5, getData(processes)), tryIncludeSeq("comments", ROCrate_encoder$6, s.Comments), ["@context", context_jsonvalue]]));
   return {
     Encode(helpers_9) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
       return helpers_9.encodeObject(arg);
     }
   };
@@ -174,15 +174,15 @@ const ROCrate_decoder = object((get$) => {
   let objectArg, arg_6, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, arg_16, objectArg_7, arg_18, objectArg_8, arg_20, objectArg_9, arg_22, objectArg_10;
   const identifier = defaultArg(bind(Study_tryIdentifierFromFileName, (objectArg = get$.Optional, objectArg.Field("filename", string))), createMissingIdentifier());
   let assays;
-  const arg_3 = list(ROCrate_decoder$5);
+  const arg_3 = list$1(ROCrate_decoder$1);
   const objectArg_1 = get$.Optional;
   assays = objectArg_1.Field("assays", arg_3);
   const assayIdentifiers = map((arg_4) => {
-    const collection = map$1((a) => a.Identifier, arg_4);
+    const collection = map$2((a) => a.Identifier, arg_4);
     return Array.from(collection);
   }, assays);
-  const tables = map((ps) => ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(ps).Tables, (arg_6 = list(ROCrate_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_6)));
-  return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = resizeArray(ROCrate_decoder$2), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16))), unwrap((arg_18 = resizeArray(ROCrate_decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18))), unwrap((arg_20 = resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_22 = resizeArray(ROCrate_decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22)))), defaultArg(assays, empty())];
+  const tables = map((ps) => ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(ps).Tables, (arg_6 = list$1(ROCrate_decoder$2), objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_6)));
+  return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = resizeArray(ROCrate_decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16))), unwrap((arg_18 = resizeArray(ROCrate_decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18))), unwrap((arg_20 = resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_22 = resizeArray(ROCrate_decoder$5), objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22)))), defaultArg(assays, empty())];
 });
 function ISAJson_encoder(idMap, assays, s) {
   const f = (s_1) => {
@@ -251,7 +251,7 @@ function ISAJson_encoder(idMap, assays, s) {
     }), study.PublicReleaseDate), tryIncludeSeq("publications", (oa_2) => ISAJson_encoder$2(idMap, oa_2), study.Publications), tryIncludeSeq("people", (person_2) => ISAJson_encoder$3(idMap, person_2), study.Contacts), tryIncludeSeq("studyDesignDescriptors", (oa_3) => OntologyAnnotation_ISAJson_encoder(idMap, oa_3), study.StudyDesignDescriptors), encodedProtocols, encodedMaterials, tryIncludeList("processSequence", (studyName_1 = s_1.Identifier, (oa_4) => ISAJson_encoder$4(studyName_1, void 0, idMap, oa_4)), processes), tryIncludeSeq("assays", (studyName_2 = s_1.Identifier, (a_2) => ISAJson_encoder$5(studyName_2, idMap, a_2)), assays_1), encodedFactors, encodedCharacteristics, encodedUnits, tryIncludeSeq("comments", (comment) => ISAJson_encoder$6(idMap, comment), study.Comments)]));
     return {
       Encode(helpers_7) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
         return helpers_7.encodeObject(arg);
       }
     };
@@ -272,13 +272,13 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
   const tables = map((arg_6) => {
     const a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(arg_6);
     return a.Tables;
-  }, (arg_5 = list(ISAJson_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_5)));
+  }, (arg_5 = list$1(ISAJson_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_5)));
   let assays;
-  const arg_8 = list(ISAJson_decoder$4);
+  const arg_8 = list$1(ISAJson_decoder$2);
   const objectArg_3 = get$.Optional;
   assays = objectArg_3.Field("assays", arg_8);
   let personsRaw;
-  const arg_10 = resizeArray(ISAJson_decoder$5);
+  const arg_10 = resizeArray(ISAJson_decoder$3);
   const objectArg_4 = get$.Optional;
   personsRaw = objectArg_4.Field("people", arg_10);
   const persons = [];
@@ -317,10 +317,10 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
     }
   }
   const assayIdentifiers = map((arg_11) => {
-    const collection = map$1((a_1) => a_1.Identifier, arg_11);
+    const collection = map$2((a_1) => a_1.Identifier, arg_11);
     return Array.from(collection);
   }, assays);
-  return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = resizeArray(ISAJson_decoder$2), objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21))), unwrap(persons.length === 0 ? void 0 : persons), unwrap((arg_23 = resizeArray(OntologyAnnotation_ISAJson_decoder), objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_25 = resizeArray(ISAJson_decoder$3), objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25)))), defaultArg(assays, empty())];
+  return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = resizeArray(ISAJson_decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21))), unwrap(persons.length === 0 ? void 0 : persons), unwrap((arg_23 = resizeArray(OntologyAnnotation_ISAJson_decoder), objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_25 = resizeArray(ISAJson_decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25)))), defaultArg(assays, empty())];
 });
 
 export { Helper_getAssayInformation, ISAJson_allowedFields, ISAJson_decoder, ISAJson_encoder, ROCrate_decoder, ROCrate_encoder, ROCrate_genID, decoder, decoderCompressed, encoder, encoderCompressed };

package/dist/ts/ts/Json/Table/ArcTable.js

@@ -1,34 +1,34 @@
-import { arrayHash, equalArrays, getEnumerator, disposeSafe, int32ToString, compareArrays } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
-import { decoder as decoder$1, encoder as encoder$2 } from './CompositeCell.js';
+import { compareArrays, arrayHash, equalArrays, getEnumerator, disposeSafe, int32ToString } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
+import { encoder as encoder$1, decoder as decoder$2 } from './CompositeCell.js';
 import { getItemFromDict } from '../../../node_modules/@fable-org/fable-library-js/MapUtil.js';
 import { ErrorReason$1_BadPrimitive } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { toList, delay, map as map$1, append, singleton, empty as empty$2 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { list as list$1 } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
-import { decoder as decoder$2, encoder as encoder$1 } from './CompositeHeader.js';
+import { toList, delay, append, singleton, map, empty } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { encoder as encoder$2, decoder as decoder$1 } from './CompositeHeader.js';
 import { intDictionary } from '../Encode.js';
-import { ColumnValueRefs_Constant, ColumnValueRefs_Sparse, ensureCellHashInValueMap, ArcTableValues, Unchecked_setCellAt } from '../../Core/Table/ArcTableAux.js';
+import { ensureCellHashInValueMap, ColumnValueRefs_Constant, ColumnValueRefs_Sparse, ArcTableValues, Unchecked_setCellAt } from '../../Core/Table/ArcTableAux.js';
 import { ArcTable } from '../../Core/Table/ArcTable.js';
-import { map, object, list, map$0027, string, resizeArray, int, Helpers_prependPath, tuple2, array } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { object, list as list$1, map$0027, tuple2, int, string, map as map$1, resizeArray, array, Helpers_prependPath } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { defaultArg } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { ofArray, empty } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { empty as empty$1, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { Dictionary } from '../../../node_modules/@fable-org/fable-library-js/MutableMap.js';
-import { empty as empty$1 } from '../../../node_modules/@fable-org/fable-library-js/Map.js';
+import { empty as empty$2 } from '../../../node_modules/@fable-org/fable-library-js/Map.js';
 import { Decode_tryOneOf, Decode_intDictionary, Decode_dictionary } from '../Decode.js';
-import { FSharpResult$2_Ok, FSharpResult$2_Error } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
+import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
 import { decodeCell, encodeCell } from './CellTable.js';
-import { item, fold, fill, setItem, iterateIndexed } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
-import { decodeString, encodeString } from '../StringTable.js';
+import { iterateIndexed, fold, setItem, fill, item } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
+import { encodeString, decodeString } from '../StringTable.js';
 
 function encoder(table) {
   const valueMap = table.Values.ValueMap;
-  const cellEncoder = (hash) => encoder$2(getItemFromDict(valueMap, hash));
+  const cellEncoder = (hash) => encoder$1(getItemFromDict(valueMap, hash));
   const values = toList(delay(() => {
     let value;
     return append(singleton(["name", (value = table.Name, {
       Encode(helpers) {
         return helpers.encodeString(value);
       }
-    })]), delay(() => append(table.Headers.length !== 0 ? singleton(["headers", list$1(toList(delay(() => map$1(encoder$1, table.Headers))))]) : empty$2(), delay(() => table.Values.RowCount !== 0 ? append(singleton(["columns", intDictionary((col) => {
+    })]), delay(() => append(table.Headers.length !== 0 ? singleton(["headers", list(toList(delay(() => map(encoder$2, table.Headers))))]) : empty(), delay(() => table.Values.RowCount !== 0 ? append(singleton(["columns", intDictionary((col) => {
       if (col.tag === /* Sparse */
       1) {
         return intDictionary(cellEncoder, col.fields[0]);
@@ -42,11 +42,11 @@ function encoder(table) {
           return helpers_1.encodeSignedIntegralNumber(value_1);
         }
       })]);
-    })) : empty$2()))));
+    })) : empty()))));
   }));
   return {
     Encode(helpers_2) {
-      const arg = map$1((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_2)], values);
+      const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_2)], values);
       return helpers_2.encodeObject(arg);
     }
   };
@@ -54,9 +54,9 @@ function encoder(table) {
 const decoderV2Deprecated = object((get$) => {
   let arg_1, objectArg, arg_3, objectArg_1, objectArg_2;
   let decodedHeader;
-  const collection = defaultArg((arg_1 = list(decoder$2), objectArg = get$.Optional, objectArg.Field("header", arg_1)), empty());
+  const collection = defaultArg((arg_1 = list$1(decoder$1), objectArg = get$.Optional, objectArg.Field("header", arg_1)), empty$1());
   decodedHeader = Array.from(collection);
-  const decodedValues = new Dictionary(defaultArg((arg_3 = map$0027(tuple2(int, int), decoder$1), objectArg_1 = get$.Optional, objectArg_1.Field("values", arg_3)), empty$1({
+  const decodedValues = new Dictionary(defaultArg((arg_3 = map$0027(tuple2(int, int), decoder$2), objectArg_1 = get$.Optional, objectArg_1.Field("values", arg_3)), empty$2({
     Compare: compareArrays
   })), {
     Equals: equalArrays,
@@ -76,11 +76,11 @@ const decoderV2Deprecated = object((get$) => {
 });
 const decoder = (() => {
   const valueMap = /* @__PURE__ */ new Map([]);
-  const cellDecoder = map((cell) => ensureCellHashInValueMap(cell, valueMap), decoder$1);
-  const columnDecoder = Decode_tryOneOf(ofArray([map(ColumnValueRefs_Constant, cellDecoder), map(ColumnValueRefs_Sparse, Decode_intDictionary(cellDecoder))]));
+  const cellDecoder = map$1((cell) => ensureCellHashInValueMap(cell, valueMap), decoder$2);
+  const columnDecoder = Decode_tryOneOf(ofArray([map$1(ColumnValueRefs_Constant, cellDecoder), map$1(ColumnValueRefs_Sparse, Decode_intDictionary(cellDecoder))]));
   const decoder_1 = object((get$) => {
     let arg_1, objectArg, arg_3, objectArg_1, objectArg_2, objectArg_3;
-    const decodedHeader = defaultArg((arg_1 = resizeArray(decoder$2), objectArg = get$.Optional, objectArg.Field("headers", arg_1)), []);
+    const decodedHeader = defaultArg((arg_1 = resizeArray(decoder$1), objectArg = get$.Optional, objectArg.Field("headers", arg_1)), []);
     const values = new ArcTableValues(defaultArg((arg_3 = Decode_dictionary(int, columnDecoder), objectArg_1 = get$.Optional, objectArg_1.Field("columns", arg_3)), /* @__PURE__ */ new Map([])), valueMap, defaultArg((objectArg_2 = get$.Optional, objectArg_2.Field("rowCount", int)), 0));
     return ArcTable.fromArcTableValues((objectArg_3 = get$.Required, objectArg_3.Field("name", string)), decodedHeader, values);
   });
@@ -96,7 +96,7 @@ function decoderCompressedColumn(cellTable, table, columnIndex) {
       const matchValue = array(decodeCell(cellTable)).Decode(helper, column);
       if (matchValue.tag === /* Error */
       1) {
-        matchValue.fields[0];
+        const err = matchValue.fields[0];
         const rangeDecoder = object((get$) => {
           let from;
           const objectArg = get$.Required;
@@ -157,7 +157,7 @@ function arrayi(decoderi) {
 }
 function encoderCompressed(stringTable, oaTable, cellTable, table) {
   const cellEncoder = (hash) => encodeCell(cellTable, getItemFromDict(table.Values.ValueMap, hash));
-  const values = toList(delay(() => append(singleton(["n", encodeString(stringTable, table.Name)]), delay(() => append(table.Headers.length !== 0 ? singleton(["h", list$1(toList(delay(() => map$1(encoder$1, table.Headers))))]) : empty$2(), delay(() => table.Values.RowCount !== 0 ? append(singleton(["c", intDictionary((col) => {
+  const values = toList(delay(() => append(singleton(["n", encodeString(stringTable, table.Name)]), delay(() => append(table.Headers.length !== 0 ? singleton(["h", list(toList(delay(() => map(encoder$2, table.Headers))))]) : empty(), delay(() => table.Values.RowCount !== 0 ? append(singleton(["c", intDictionary((col) => {
     if (col.tag === /* Sparse */
     1) {
       return intDictionary(cellEncoder, col.fields[0]);
@@ -171,10 +171,10 @@ function encoderCompressed(stringTable, oaTable, cellTable, table) {
         return helpers.encodeSignedIntegralNumber(value);
       }
     })]);
-  })) : empty$2()))))));
+  })) : empty()))))));
   return {
     Encode(helpers_1) {
-      const arg = map$1((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_1)], values);
+      const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_1)], values);
       return helpers_1.encodeObject(arg);
     }
   };
@@ -183,7 +183,7 @@ function decoderCompressedV2Deprecated(stringTable, oaTable, cellTable) {
   return object((get$) => {
     let arg_1, objectArg, arg_3, objectArg_1, arg_5, objectArg_2;
     let decodedHeader;
-    const collection = defaultArg((arg_1 = list(decoder$2), objectArg = get$.Optional, objectArg.Field("h", arg_1)), empty());
+    const collection = defaultArg((arg_1 = list$1(decoder$1), objectArg = get$.Optional, objectArg.Field("h", arg_1)), empty$1());
     decodedHeader = Array.from(collection);
     const table = ArcTable.create((arg_3 = decodeString(stringTable), objectArg_1 = get$.Required, objectArg_1.Field("n", arg_3)), decodedHeader, []);
     arg_5 = arrayi((columnIndex) => decoderCompressedColumn(cellTable, table, columnIndex)), objectArg_2 = get$.Optional, objectArg_2.Field("c", arg_5);
@@ -192,11 +192,11 @@ function decoderCompressedV2Deprecated(stringTable, oaTable, cellTable) {
 }
 function decoderCompressed(stringTable, oaTable, cellTable) {
   const valueMap = /* @__PURE__ */ new Map([]);
-  const cellDecoder = map((i) => ensureCellHashInValueMap(item(i, cellTable), valueMap), int);
-  const columnDecoder = Decode_tryOneOf(ofArray([map(ColumnValueRefs_Constant, cellDecoder), map(ColumnValueRefs_Sparse, Decode_intDictionary(cellDecoder))]));
+  const cellDecoder = map$1((i) => ensureCellHashInValueMap(item(i, cellTable), valueMap), int);
+  const columnDecoder = Decode_tryOneOf(ofArray([map$1(ColumnValueRefs_Constant, cellDecoder), map$1(ColumnValueRefs_Sparse, Decode_intDictionary(cellDecoder))]));
   const decoder_1 = object((get$) => {
     let arg_1, objectArg, arg_3, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    const decodedHeader = defaultArg((arg_1 = resizeArray(decoder$2), objectArg = get$.Optional, objectArg.Field("h", arg_1)), []);
+    const decodedHeader = defaultArg((arg_1 = resizeArray(decoder$1), objectArg = get$.Optional, objectArg.Field("h", arg_1)), []);
     const values = new ArcTableValues(defaultArg((arg_3 = Decode_dictionary(int, columnDecoder), objectArg_1 = get$.Optional, objectArg_1.Field("c", arg_3)), /* @__PURE__ */ new Map([])), valueMap, defaultArg((objectArg_2 = get$.Optional, objectArg_2.Field("r", int)), 0));
     return ArcTable.fromArcTableValues((arg_7 = decodeString(stringTable), objectArg_3 = get$.Required, objectArg_3.Field("n", arg_7)), decodedHeader, values);
   });

package/dist/ts/ts/Json/Table/CellTable.js

@@ -1,22 +1,22 @@
-import { toArray, map as map$1, sortBy } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { toArray, map, sortBy } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { Dictionary_items, Dictionary_tryFind } from '../../Core/Helper/Collections.js';
 import { comparePrimitives } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
-import { map, item } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
-import { decoderCompressed, encoderCompressed } from './CompositeCell.js';
+import { map as map$1, item } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
+import { encoderCompressed, decoderCompressed } from './CompositeCell.js';
 import { array, object, int } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-js/MapUtil.js';
 
 function arrayFromMap(otm) {
-  return toArray(map$1((kv_1) => kv_1[0], sortBy((kv) => kv[1], Dictionary_items(otm), {
+  return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], Dictionary_items(otm), {
     Compare: comparePrimitives
   })));
 }
 function encoder(stringTable, oaTable, ot) {
-  const values = map((cc) => encoderCompressed(stringTable, oaTable, cc), ot);
+  const values = map$1((cc) => encoderCompressed(stringTable, oaTable, cc), ot);
   return {
     Encode(helpers) {
-      const arg = map((v) => v.Encode(helpers), values);
+      const arg = map$1((v) => v.Encode(helpers), values);
       return helpers.encodeArray(arg);
     }
   };

package/dist/ts/ts/Json/Table/CompositeCell.js

@@ -1,13 +1,13 @@
-import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from '../OntologyAnnotation.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder } from '../OntologyAnnotation.js';
 import { singleton, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { compressedDecoder, compressedEncoder, decoder as decoder$1, encoder as encoder$1 } from '../Data.js';
+import { encoder as encoder$1, decoder as decoder$1, compressedEncoder, compressedDecoder } from '../Data.js';
 import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { map } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { CompositeCell_FreeText, CompositeCell_Term, CompositeCell_Unitized, CompositeCell_Data } from '../../Core/Table/CompositeCell.js';
 import { object, string, index } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { toFail, printf } from '../../../node_modules/@fable-org/fable-library-js/String.js';
-import { decodeOA, encodeOA } from './OATable.js';
-import { decodeString, encodeString } from '../StringTable.js';
+import { encodeOA, decodeOA } from './OATable.js';
+import { encodeString, decodeString } from '../StringTable.js';
 
 function encoder(cc) {
   const oaToJsonString = OntologyAnnotation_encoder;

package/dist/ts/ts/Json/Table/CompositeHeader.js

@@ -1,6 +1,6 @@
-import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from '../OntologyAnnotation.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder } from '../OntologyAnnotation.js';
 import { empty, singleton } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { decoder as decoder$1, encoder as encoder$1 } from './IOType.js';
+import { encoder as encoder$1, decoder as decoder$1 } from './IOType.js';
 import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { map } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { CompositeHeader_Characteristic, CompositeHeader_Parameter, CompositeHeader_Component, CompositeHeader_Factor, CompositeHeader_Input, CompositeHeader_Output, CompositeHeader_ProtocolType, CompositeHeader_ProtocolREF, CompositeHeader_ProtocolDescription, CompositeHeader_ProtocolUri, CompositeHeader_ProtocolVersion, CompositeHeader_Performer, CompositeHeader_Date, CompositeHeader_Comment, CompositeHeader_FreeText } from '../../Core/Table/CompositeHeader.js';

package/dist/ts/ts/Json/Table/IOType.js

@@ -1,6 +1,6 @@
 import { toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
 import { IOType } from '../../Core/Table/CompositeHeader.js';
-import { andThen, string, succeed } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { andThen, succeed, string } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 
 function encoder(io) {
   const value = toString(io);