@nfdi4plants/arctrl 3.1.1 → 3.2.0

package/dist/ts/ts/Json/Encode.js

@@ -1,38 +1,40 @@
-import { map, value, defaultArg } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { Json_Object } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { isEmpty, map as map$1, append, toArray } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { seq, list, tuple2 } from '../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
-import { map as map$2, item } from '../../node_modules/@fable-org/fable-library-js/Array.js';
-import { isEmpty as isEmpty$1, map as map$3 } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-js/Date.js';
-import { count } from '../../node_modules/@fable-org/fable-library-js/CollectionUtil.js';
-import { toFail, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { value, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Json_Object$ } from '../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { isEmpty, map, toArray } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { seq, list, tuple2 } from '../fable_modules/Thoth.Json.Core.0.9.1/Encode.fs.js';
+import { map as map$1, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { isEmpty as isEmpty$1, map as map$2, append, singleton } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { toString } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
+import { count } from '../../node_modules/@fable-org/fable-library-ts/CollectionUtil.js';
+import { toFail, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 
-function tryInclude(name, encoder, value) {
-  return [name, map(encoder, value)];
+function tryInclude(name, encoder, value$1) {
+  let option_1 = void 0;
+  return [name, (option_1 = value$1, option_1 != null ? encoder(value(option_1)) : void 0)];
 }
 function tryIncludeSeq(name, encoder, value) {
-  return [name, isEmpty(value) ? void 0 : seq(map$1(encoder, value))];
+  return [name, isEmpty(value) ? void 0 : seq(map(encoder, value))];
 }
 function tryIncludeArray(name, encoder, value) {
-  let values;
-  return [name, value.length === 0 ? void 0 : (values = map$2(encoder, value), {
+  let values = void 0;
+  return [name, value.length === 0 ? void 0 : (values = map$1(encoder, value), {
     Encode(helpers) {
-      const arg = map$2((v) => v.Encode(helpers), values);
+      const arg = map$1((v) => v.Encode(helpers), values);
       return helpers.encodeArray(arg);
     }
   })];
 }
 function tryIncludeList(name, encoder, value) {
-  return [name, isEmpty$1(value) ? void 0 : list(map$3(encoder, value))];
+  return [name, isEmpty$1(value) ? void 0 : list(map$2(encoder, value))];
 }
 function tryIncludeListOpt(name, encoder, value$1) {
-  let o;
-  return [name, value$1 != null ? (o = value(value$1), isEmpty$1(o) ? void 0 : list(map$3(encoder, o))) : void 0];
+  let o = void 0;
+  return [name, value$1 != null ? (o = value(value$1), isEmpty$1(o) ? void 0 : list(map$2(encoder, o))) : void 0];
 }
 const DefaultSpaces = 0;
 function defaultSpaces(spaces) {
-  return defaultArg(spaces, DefaultSpaces);
+  return defaultArg(spaces, DefaultSpaces) | 0;
 }
 function dateTime(d) {
   const value = item(0, toString(d, "O", {}).split("+"));
@@ -44,17 +46,17 @@ function dateTime(d) {
 }
 function addPropertyToObject(name, value, obj) {
   if (obj.tag === /* Object */
-  5) {
-    return Json_Object(append(obj.fields[0], [[name, value]]));
+  4) {
+    return Json_Object$(append(obj.fields[0], singleton([name, value])));
   } else {
-    throw new Error("Expected object");
+    throw new Exception("Expected object");
   }
 }
 function resizeArrayOrSingleton(encoder, values) {
   if (values.length === 1) {
-    return encoder(values[0]);
+    return encoder(item(0, values));
   } else {
-    return seq(map$1(encoder, values));
+    return seq(map(encoder, values));
   }
 }
 function dictionary(keyEncoder, valueEncoder, values) {
@@ -65,7 +67,7 @@ function dictionary(keyEncoder, valueEncoder, values) {
       }
     };
   } else {
-    return seq(toArray(map$1((_arg) => {
+    return seq(toArray(map((_arg) => {
       const activePatternResult = _arg;
       return tuple2(keyEncoder, valueEncoder, activePatternResult[0], activePatternResult[1]);
     }, values)));
@@ -79,7 +81,7 @@ function intDictionary(valueEncoder, values) {
       }
     };
   } else {
-    return seq(toArray(map$1((_arg) => {
+    return seq(toArray(map((_arg) => {
       const activePatternResult = _arg;
       const k = activePatternResult[0] | 0;
       if (k > 2147483647 ? true : k < -2147483648) {

package/dist/ts/ts/Json/IDTable.d.ts

@@ -1,5 +1,5 @@
-import { IEncodable } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { IEncodable } from '../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { IMap } from '@fable-org/fable-library-ts/Util.ts';
 export declare function encodeID(id: string): IEncodable;
 export declare function encode<Value>(genID: ((arg0: Value) => string), encoder: ((arg0: Value) => IEncodable), value: Value, table: IMap<string, IEncodable>): IEncodable;
 //# sourceMappingURL=IDTable.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"IDTable.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/IDTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,oDAAoD,CAAC;AAGnG,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAY/C;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,UAAU,CAUjK"}
+{"version":3,"file":"IDTable.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/IDTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAqB,MAAM,oDAAoD,CAAC;AAGnG,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAY/C;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,UAAU,CAUjK"}

package/dist/ts/ts/Json/IDTable.js

@@ -1,5 +1,5 @@
-import { map } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { addToDict } from '../../node_modules/@fable-org/fable-library-js/MapUtil.js';
+import { map } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { addToDict } from '../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 
 function encodeID(id) {
   const values_1 = [["@id", {

package/dist/ts/ts/Json/Investigation.d.ts

@@ -1,15 +1,15 @@
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Decoder$1, IEncodable } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { ArcInvestigation } 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 { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
-import { CompositeCell_$union } from '../Core/Table/CompositeCell.js';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Decoder$1, IEncodable } from '../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { ArcInvestigation } from '../Core/ArcTypes.ts';
+import { MutableArray, IMap } from '@fable-org/fable-library-ts/Util.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { OntologyAnnotation } from '../Core/OntologyAnnotation.ts';
+import { CompositeCell_$union } from '../Core/Table/CompositeCell.ts';
 export declare function encoder(inv: ArcInvestigation): IEncodable;
 export declare const decoder: Decoder$1<ArcInvestigation>;
 export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, inv: ArcInvestigation): IEncodable;
-export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<ArcInvestigation>;
+export declare function decoderCompressed(stringTable: MutableArray<string>, oaTable: MutableArray<OntologyAnnotation>, cellTable: MutableArray<CompositeCell_$union>): Decoder$1<ArcInvestigation>;
 export declare function ROCrate_genID(i: ArcInvestigation): string;
 export declare function ROCrate_encoder(oa: ArcInvestigation): IEncodable;
 export declare const ROCrate_decoder: Decoder$1<ArcInvestigation>;

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

@@ -1 +1 @@
-{"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Investigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAA0B,MAAM,qCAAqC,CAAC;AAChG,OAAO,EAAyC,MAAM,EAAO,MAAM,uCAAuC,CAAC;AAC3G,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAS9G,OAAO,EAAE,gBAAgB,EAAsB,MAAM,qBAAqB,CAAC;AAM3E,OAAO,EAAc,IAAI,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAQtE,wBAAgB,OAAO,CAAC,GAAG,EAAE,gBAAgB,GAAG,UAAU,CAiCzD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAG9C,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,gBAAgB,GAAG,UAAU,CAiC7L;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKtJ;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAEzD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,gBAAgB,GAAG,UAAU,CA6ChE;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,gBAAgB,CAoBtD,CAAC;AAEH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,gBAAgB,GAAG,UAAU,CAgBtE;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAA+M,CAAC;AAErQ,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,gBAAgB,GAAG,UAAU,CAqC1G;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,gBAAgB,CAoBtD,CAAC"}
+{"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Investigation.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,UAAU,EAA0B,MAAM,qCAAqC,CAAC;AAChG,OAAO,EAAyC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACtG,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAS9G,OAAO,EAAE,gBAAgB,EAAsB,MAAM,qBAAqB,CAAC;AAM3E,OAAO,EAAc,YAAY,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAQtE,wBAAgB,OAAO,CAAC,GAAG,EAAE,gBAAgB,GAAG,UAAU,CAyCzD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAG9C,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,gBAAgB,GAAG,UAAU,CAyC7L;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAE,YAAY,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAK1L;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAEzD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,gBAAgB,GAAG,UAAU,CAqDhE;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,gBAAgB,CAoBtD,CAAC;AAEH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,gBAAgB,GAAG,UAAU,CAwBtE;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAA+M,CAAC;AAErQ,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,gBAAgB,GAAG,UAAU,CA6C1G;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,gBAAgB,CAoBtD,CAAC"}

package/dist/ts/ts/Json/Investigation.js

@@ -1,5 +1,5 @@
-import { choose, ofArray, unzip, empty } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { map, unwrap, defaultArg, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { choose, ofArray, unzip, empty } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { value, unwrap, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
 import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$2 } from './OntologySourceReference.js';
 import { encoder as encoder$2, decoder as decoder$2, ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$3 } from './Publication.js';
@@ -8,21 +8,28 @@ import { encoder as encoder$4, decoder as decoder$4, encoderCompressed as encode
 import { ArcInvestigation } from '../Core/ArcTypes.js';
 import { encoder as encoder$5, decoder as decoder$5, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2, ROCrate_encoder as ROCrate_encoder$4, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$4, ISAJson_decoder as ISAJson_decoder$1 } from './Study.js';
 import { encoder as encoder$6, decoder as decoder$6, ROCrate_encoder as ROCrate_encoder$5, ROCrate_decoder as ROCrate_decoder$5, ISAJson_encoder as ISAJson_encoder$5, ISAJson_decoder as ISAJson_decoder$5 } from './Comment.js';
-import { map as map$1, concat } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { object, string, resizeArray, list } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
-import { stringHash } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { today, toString } from '../../node_modules/@fable-org/fable-library-js/Date.js';
+import { map, concat } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { object, string, resizeArray, list } from '../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
+import { stringHash } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { today, toString } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
 import { context_jsonvalue } from './context/rocrate/isa_investigation_context.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
-import { distinctBy } from '../../node_modules/@fable-org/fable-library-js/Seq2.js';
+import { distinctBy } from '../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { conformsTo_jsonvalue, context_jsonvalue as context_jsonvalue$1 } from './context/rocrate/rocrate_context.js';
 import { Decode_objectNoAdditionalProperties } from './Decode.js';
 
 function encoder(inv) {
-  let value;
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
+  let value$1 = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["Identifier", (value$1 = inv.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -47,20 +54,27 @@ function encoder(inv) {
   }), inv.RegisteredStudyIdentifiers), tryIncludeSeq("Comments", encoder$6, inv.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
 }
 const decoder = 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;
+  let objectArg = void 0, objectArg_1 = void 0, objectArg_2 = void 0, objectArg_3 = void 0, objectArg_4 = void 0, arg_11 = void 0, objectArg_5 = void 0, arg_13 = void 0, objectArg_6 = void 0, arg_15 = void 0, objectArg_7 = void 0, arg_17 = void 0, objectArg_8 = void 0, arg_19 = void 0, objectArg_9 = void 0, arg_21 = void 0, objectArg_10 = void 0, arg_23 = void 0, objectArg_11 = void 0;
   return new ArcInvestigation((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("OntologySourceReferences", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Publications", arg_13))), unwrap((arg_15 = resizeArray(decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("Contacts", arg_15))), unwrap((arg_17 = resizeArray(decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("Assays", arg_17))), unwrap((arg_19 = resizeArray(decoder$5), objectArg_9 = get$.Optional, objectArg_9.Field("Studies", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredStudyIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$6), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, inv) {
-  let value;
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
+  let value$1 = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["Identifier", (value$1 = inv.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -85,14 +99,14 @@ function encoderCompressed(stringTable, oaTable, cellTable, inv) {
   }), inv.RegisteredStudyIdentifiers), tryIncludeSeq("Comments", encoder$6, inv.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
 }
 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;
+    let objectArg = void 0, objectArg_1 = void 0, objectArg_2 = void 0, objectArg_3 = void 0, objectArg_4 = void 0, arg_11 = void 0, objectArg_5 = void 0, arg_13 = void 0, objectArg_6 = void 0, arg_15 = void 0, objectArg_7 = void 0, arg_17 = void 0, objectArg_8 = void 0, arg_19 = void 0, objectArg_9 = void 0, arg_21 = void 0, objectArg_10 = void 0, arg_23 = void 0, objectArg_11 = void 0;
     return new ArcInvestigation((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("OntologySourceReferences", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Publications", arg_13))), unwrap((arg_15 = resizeArray(decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("Contacts", arg_15))), unwrap((arg_17 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_8 = get$.Optional, objectArg_8.Field("Assays", arg_17))), unwrap((arg_19 = resizeArray(decoderCompressed$2(stringTable, oaTable, cellTable)), objectArg_9 = get$.Optional, objectArg_9.Field("Studies", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredStudyIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$6), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
   });
 }
@@ -100,10 +114,17 @@ function ROCrate_genID(i) {
   return "./";
 }
 function ROCrate_encoder(oa) {
-  let value, value_3, value_4, value_12, copyOfStruct;
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(oa), {
+  let value$1 = void 0, value_3 = void 0, value_4 = void 0, value_12 = void 0, copyOfStruct = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_2 = tupledArg[1];
+    if (option_2 != null) {
+      return [tupledArg[0], value(option_2)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["@id", (value$1 = ROCrate_genID(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["@type", {
     Encode(helpers_1) {
@@ -140,13 +161,13 @@ function ROCrate_encoder(oa) {
   })], tryIncludeSeq("ontologySourceReferences", ROCrate_encoder$1, oa.OntologySourceReferences), tryIncludeSeq("publications", ROCrate_encoder$2, oa.Publications), tryIncludeSeq("people", ROCrate_encoder$3, oa.Contacts), tryIncludeSeq("studies", (s) => ROCrate_encoder$4(void 0, s), oa.Studies), tryIncludeSeq("comments", ROCrate_encoder$5, oa.Comments), ["@context", context_jsonvalue]]));
   return {
     Encode(helpers_9) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
       return helpers_9.encodeObject(arg);
     }
   };
 }
 const ROCrate_decoder = object((get$) => {
-  let arg_3, 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;
+  let arg_3 = void 0, objectArg_1 = void 0, objectArg_2 = void 0, objectArg_3 = void 0, objectArg_4 = void 0, objectArg_5 = void 0, arg_13 = void 0, objectArg_6 = void 0, arg_15 = void 0, objectArg_7 = void 0, arg_17 = void 0, objectArg_8 = void 0, arg_19 = void 0, objectArg_9 = void 0;
   let identifier;
   let matchValue;
   const objectArg = get$.Optional;
@@ -157,17 +178,24 @@ const ROCrate_decoder = object((get$) => {
   let assays;
   const collection = distinctBy((a) => a.Identifier, concat(patternInput[1]), {
     Equals: (x, y) => x === y,
-    GetHashCode: stringHash
+    GetHashCode: (x) => stringHash(x) | 0
   });
   assays = Array.from(collection);
   const studies = Array.from(studiesRaw);
   let studyIdentifiers;
-  const collection_1 = map$1((a_1) => a_1.Identifier, studiesRaw);
+  const collection_1 = map((a_1) => a_1.Identifier, studiesRaw);
   studyIdentifiers = Array.from(collection_1);
   return new ArcInvestigation(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("title", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("description", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("submissionDate", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("publicReleaseDate", string))), unwrap((arg_13 = resizeArray(ROCrate_decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("ontologySourceReferences", arg_13))), unwrap((arg_15 = resizeArray(ROCrate_decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_15))), unwrap((arg_17 = resizeArray(ROCrate_decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_17))), assays, studies, void 0, void 0, studyIdentifiers, unwrap((arg_19 = resizeArray(ROCrate_decoder$5), objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))));
 });
 function ROCrate_encodeRoCrate(oa) {
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@type", (value) => ({
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([tryInclude("@type", (value) => ({
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -178,17 +206,24 @@ function ROCrate_encodeRoCrate(oa) {
   }), "ro-crate-metadata.json"), tryInclude("about", ROCrate_encoder, oa), ["conformsTo", conformsTo_jsonvalue], ["@context", context_jsonvalue$1]]));
   return {
     Encode(helpers_2) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
       return helpers_2.encodeObject(arg);
     }
   };
 }
 const ISAJson_allowedFields = ofArray(["@id", "filename", "identifier", "title", "description", "submissionDate", "publicReleaseDate", "ontologySourceReferences", "publications", "people", "studies", "comments", "@type", "@context"]);
 function ISAJson_encoder(idMap, inv) {
-  let value, value_1, value_2;
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(inv), {
+  let value$1 = void 0, value_1 = void 0, value_2 = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["@id", (value$1 = ROCrate_genID(inv), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["filename", (value_1 = ArcInvestigation.FileName, {
     Encode(helpers_1) {
@@ -217,13 +252,13 @@ function ISAJson_encoder(idMap, inv) {
   }), inv.PublicReleaseDate), tryIncludeSeq("ontologySourceReferences", (osr) => ISAJson_encoder$1(idMap, osr), inv.OntologySourceReferences), tryIncludeSeq("publications", (oa) => ISAJson_encoder$2(idMap, oa), inv.Publications), tryIncludeSeq("people", (person) => ISAJson_encoder$3(idMap, person), inv.Contacts), tryIncludeSeq("studies", (s) => ISAJson_encoder$4(idMap, void 0, s), inv.Studies), tryIncludeSeq("comments", (comment) => ISAJson_encoder$5(idMap, comment), inv.Comments)]));
   return {
     Encode(helpers_7) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
       return helpers_7.encodeObject(arg);
     }
   };
 }
 const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
-  let arg_3, 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;
+  let arg_3 = void 0, objectArg_1 = void 0, objectArg_2 = void 0, objectArg_3 = void 0, objectArg_4 = void 0, objectArg_5 = void 0, arg_13 = void 0, objectArg_6 = void 0, arg_15 = void 0, objectArg_7 = void 0, arg_17 = void 0, objectArg_8 = void 0, arg_19 = void 0, objectArg_9 = void 0;
   let identifer;
   let matchValue;
   const objectArg = get$.Optional;
@@ -234,12 +269,12 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
   let assays;
   const collection = distinctBy((a) => a.Identifier, concat(patternInput[1]), {
     Equals: (x, y) => x === y,
-    GetHashCode: stringHash
+    GetHashCode: (x) => stringHash(x) | 0
   });
   assays = Array.from(collection);
   const studies = Array.from(studiesRaw);
   let studyIdentifiers;
-  const collection_1 = map$1((a_1) => a_1.Identifier, studiesRaw);
+  const collection_1 = map((a_1) => a_1.Identifier, studiesRaw);
   studyIdentifiers = Array.from(collection_1);
   return new ArcInvestigation(identifer, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("title", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("description", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("submissionDate", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("publicReleaseDate", string))), unwrap((arg_13 = resizeArray(ISAJson_decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("ontologySourceReferences", arg_13))), unwrap((arg_15 = resizeArray(ISAJson_decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_15))), unwrap((arg_17 = resizeArray(ISAJson_decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_17))), assays, studies, void 0, void 0, studyIdentifiers, unwrap((arg_19 = resizeArray(ISAJson_decoder$5), objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))));
 });

package/dist/ts/ts/Json/OntologyAnnotation.d.ts

@@ -1,13 +1,13 @@
-import { IMap } from '@fable-org/fable-library-js/Util.js';
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { IEncodable, Decoder$1 } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
+import { MutableArray, IMap } from '@fable-org/fable-library-ts/Util.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { IEncodable, Decoder$1 } from '../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { OntologyAnnotation } from '../Core/OntologyAnnotation.ts';
 export declare const AnnotationValue_decoder: Decoder$1<string>;
 export declare function OntologyAnnotation_encoder(oa: OntologyAnnotation): IEncodable;
 export declare const OntologyAnnotation_decoder: Decoder$1<OntologyAnnotation>;
 export declare function OntologyAnnotation_compressedEncoder(stringTable: IMap<string, int32>, oa: OntologyAnnotation): IEncodable;
-export declare function OntologyAnnotation_compressedDecoder(stringTable: string[]): Decoder$1<OntologyAnnotation>;
+export declare function OntologyAnnotation_compressedDecoder(stringTable: MutableArray<string>): Decoder$1<OntologyAnnotation>;
 export declare function OntologyAnnotation_ROCrate_genID(o: OntologyAnnotation): string;
 export declare function OntologyAnnotation_ROCrate_encoderDefinedTerm(oa: OntologyAnnotation): IEncodable;
 export declare const OntologyAnnotation_ROCrate_decoderDefinedTerm: Decoder$1<OntologyAnnotation>;

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

@@ -1 +1 @@
-{"version":3,"file":"OntologyAnnotation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/OntologyAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAW,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAqB,UAAU,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC9G,OAAO,EAA4B,MAAM,EAAgB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AASnE,eAAO,MAAM,uBAAuB,EAAE,SAAS,CAAC,MAAM,CAA2J,CAAC;AAElN,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAoB7E;AAED,eAAO,MAAM,0BAA0B,EAAE,SAAS,CAAC,kBAAkB,CAGnE,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAQzH;AAED,wBAAgB,oCAAoC,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAKzG;AAED,wBAAgB,gCAAgC,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAoB9E;AAED,wBAAgB,6CAA6C,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CA6BhG;AAED,eAAO,MAAM,6CAA6C,EAAE,SAAS,CAAC,kBAAkB,CAGtF,CAAC;AAEH,wBAAgB,+CAA+C,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAyBlG;AAED,eAAO,MAAM,+CAA+C,EAAE,SAAS,CAAC,kBAAkB,CAGxF,CAAC;AAEH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAsD9H;AAED,eAAO,MAAM,kCAAkC,EAAE,SAAS,CAAC,kBAAkB,CAA8B,CAAC"}
+{"version":3,"file":"OntologyAnnotation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/OntologyAnnotation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,IAAI,EAAiB,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAW,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAqB,UAAU,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC9G,OAAO,EAA4B,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAKzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AASnE,eAAO,MAAM,uBAAuB,EAAE,SAAS,CAAC,MAAM,CAA2J,CAAC;AAElN,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CA4B7E;AAED,eAAO,MAAM,0BAA0B,EAAE,SAAS,CAAC,kBAAkB,CAGnE,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAgBzH;AAED,wBAAgB,oCAAoC,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAKrH;AAED,wBAAgB,gCAAgC,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAoB9E;AAED,wBAAgB,6CAA6C,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAqChG;AAED,eAAO,MAAM,6CAA6C,EAAE,SAAS,CAAC,kBAAkB,CAGtF,CAAC;AAEH,wBAAgB,+CAA+C,CAAC,EAAE,EAAE,kBAAkB,GAAG,UAAU,CAiClG;AAED,eAAO,MAAM,+CAA+C,EAAE,SAAS,CAAC,kBAAkB,CAGxF,CAAC;AAEH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,kBAAkB,GAAG,UAAU,CA8D9H;AAED,eAAO,MAAM,kCAAkC,EAAE,SAAS,CAAC,kBAAkB,CAA8B,CAAC"}

package/dist/ts/ts/Json/OntologyAnnotation.js

@@ -1,13 +1,13 @@
-import { oneOf, map, string, int, float, object, resizeArray } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
-import { int32ToString } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { ofArray, choose } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { map as map$1, unwrap, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { oneOf, map, string, int, float, object, resizeArray } from '../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
+import { int32ToString } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { ofArray, choose } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
 import { encoder, decoder, ROCrate_encoderDisambiguatingDescription, ROCrate_decoderDisambiguatingDescription } from './Comment.js';
-import { map as map$2, filter } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { map as map$1, filter } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
 import { encodeString, decodeString } from './StringTable.js';
-import { replace } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { replace } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 import { URIModule_toString } from '../Core/URI.js';
 import { context_jsonvalue } from './context/rocrate/isa_ontology_annotation_context.js';
 import { context_jsonvalue as context_jsonvalue$1 } from './context/rocrate/property_value_context.js';
@@ -16,7 +16,14 @@ import { encode } from './IDTable.js';
 
 const AnnotationValue_decoder = oneOf(ofArray([map(int32ToString, int), map((value_1) => value_1.toString(), float), string]));
 function OntologyAnnotation_encoder(oa) {
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("annotationValue", (value) => ({
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([tryInclude("annotationValue", (value) => ({
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -31,27 +38,34 @@ function OntologyAnnotation_encoder(oa) {
   }), oa.TermAccessionNumber), tryIncludeSeq("comments", encoder, oa.Comments)]));
   return {
     Encode(helpers_3) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
       return helpers_3.encodeObject(arg);
     }
   };
 }
 const OntologyAnnotation_decoder = object((get$) => {
-  let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
+  let objectArg = void 0, objectArg_1 = void 0, objectArg_2 = void 0, arg_7 = void 0, objectArg_3 = void 0;
   return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = resizeArray(decoder), objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
 });
 function OntologyAnnotation_compressedEncoder(stringTable, oa) {
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("a", (s) => encodeString(stringTable, s), oa.Name), tryInclude("ts", (s_1) => encodeString(stringTable, s_1), oa.TermSourceREF), tryInclude("ta", (s_2) => encodeString(stringTable, s_2), oa.TermAccessionNumber), tryIncludeSeq("comments", encoder, oa.Comments)]));
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([tryInclude("a", (s) => encodeString(stringTable, s), oa.Name), tryInclude("ts", (s_1) => encodeString(stringTable, s_1), oa.TermSourceREF), tryInclude("ta", (s_2) => encodeString(stringTable, s_2), oa.TermAccessionNumber), tryIncludeSeq("comments", encoder, oa.Comments)]));
   return {
     Encode(helpers) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values_1);
       return helpers.encodeObject(arg);
     }
   };
 }
 function OntologyAnnotation_compressedDecoder(stringTable) {
   return object((get$) => {
-    let arg_1, objectArg, arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3;
+    let arg_1 = void 0, objectArg = void 0, arg_3 = void 0, objectArg_1 = void 0, arg_5 = void 0, objectArg_2 = void 0, arg_7 = void 0, objectArg_3 = void 0;
     return new OntologyAnnotation(unwrap((arg_1 = decodeString(stringTable), objectArg = get$.Optional, objectArg.Field("a", arg_1))), unwrap((arg_3 = decodeString(stringTable), objectArg_1 = get$.Optional, objectArg_1.Field("ts", arg_3))), unwrap((arg_5 = decodeString(stringTable), objectArg_2 = get$.Optional, objectArg_2.Field("ta", arg_5))), unwrap((arg_7 = resizeArray(decoder), objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
   });
 }
@@ -74,10 +88,17 @@ function OntologyAnnotation_ROCrate_genID(o) {
   }
 }
 function OntologyAnnotation_ROCrate_encoderDefinedTerm(oa) {
-  let value;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = OntologyAnnotation_ROCrate_genID(oa), {
+  let value$1 = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["@id", (value$1 = OntologyAnnotation_ROCrate_genID(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["@type", {
     Encode(helpers_1) {
@@ -98,20 +119,27 @@ function OntologyAnnotation_ROCrate_encoderDefinedTerm(oa) {
   }), oa.TermAccessionNumber), tryIncludeSeq("comments", ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue]]));
   return {
     Encode(helpers_5) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values_1);
       return helpers_5.encodeObject(arg);
     }
   };
 }
 const OntologyAnnotation_ROCrate_decoderDefinedTerm = object((get$) => {
-  let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
+  let objectArg = void 0, objectArg_1 = void 0, objectArg_2 = void 0, arg_7 = void 0, objectArg_3 = void 0;
   return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = resizeArray(ROCrate_decoderDisambiguatingDescription), objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
 });
 function OntologyAnnotation_ROCrate_encoderPropertyValue(oa) {
-  let value;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = OntologyAnnotation_ROCrate_genID(oa), {
+  let value$1 = void 0;
+  const values_1 = choose((tupledArg) => {
+    const option_1 = tupledArg[1];
+    if (option_1 != null) {
+      return [tupledArg[0], value(option_1)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["@id", (value$1 = OntologyAnnotation_ROCrate_genID(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["@type", {
     Encode(helpers_1) {
@@ -128,20 +156,20 @@ function OntologyAnnotation_ROCrate_encoderPropertyValue(oa) {
   }), oa.TermAccessionNumber), tryIncludeSeq("comments", ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue$1]]));
   return {
     Encode(helpers_4) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
       return helpers_4.encodeObject(arg);
     }
   };
 }
 const OntologyAnnotation_ROCrate_decoderPropertyValue = object((get$) => {
-  let objectArg, objectArg_1, arg_5, objectArg_2;
+  let objectArg = void 0, objectArg_1 = void 0, arg_5 = void 0, objectArg_2 = void 0;
   return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("category", string))), void 0, unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("categoryCode", string))), unwrap((arg_5 = resizeArray(ROCrate_decoderDisambiguatingDescription), objectArg_2 = get$.Optional, objectArg_2.Field("comments", arg_5))));
 });
 function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
   const f = (oa_1) => {
     const comments = filter((c) => {
       const matchValue = c.Name;
-      let matchResult, n_1;
+      let matchResult = void 0, n_1 = void 0;
       if (matchValue != null) {
         if (value(matchValue) === orderName) {
           matchResult = 0;
@@ -159,7 +187,14 @@ function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
           return true;
       }
     }, oa_1.Comments);
-    const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+    const values_1 = choose((tupledArg) => {
+      const option_1 = tupledArg[1];
+      if (option_1 != null) {
+        return [tupledArg[0], value(option_1)];
+      } else {
+        return void 0;
+      }
+    }, ofArray([tryInclude("@id", (value) => ({
       Encode(helpers) {
         return helpers.encodeString(value);
       }
@@ -178,7 +213,7 @@ function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
     }), oa_1.TermAccessionNumber), tryIncludeSeq("comments", encoder, comments)]));
     return {
       Encode(helpers_4) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
         return helpers_4.encodeObject(arg);
       }
     };

package/dist/ts/ts/Json/OntologySourceReference.d.ts

@@ -1,7 +1,7 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Decoder$1, IEncodable } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { OntologySourceReference } from '../Core/OntologySourceReference.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Decoder$1, IEncodable } from '../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { OntologySourceReference } from '../Core/OntologySourceReference.ts';
+import { IMap } from '@fable-org/fable-library-ts/Util.ts';
 export declare function encoder(osr: OntologySourceReference): IEncodable;
 export declare const decoder: Decoder$1<OntologySourceReference>;
 export declare function ROCrate_genID(o: OntologySourceReference): string;

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

@@ -1 +1 @@
-{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/OntologySourceReference.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,MAAM,EAAO,MAAM,uCAAuC,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAK9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,OAAO,CAAC,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAwBhE;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAGrD,CAAC;AAEH,wBAAgB,aAAa,CAAC,CAAC,EAAE,uBAAuB,GAAG,MAAM,CAchE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAiCxE;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,uBAAuB,CAG7D,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAwBjH;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,uBAAuB,CAAW,CAAC"}
+{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/OntologySourceReference.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAK9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,OAAO,CAAC,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAgChE;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAGrD,CAAC;AAEH,wBAAgB,aAAa,CAAC,CAAC,EAAE,uBAAuB,GAAG,MAAM,CAchE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAyCxE;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,uBAAuB,CAG7D,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,uBAAuB,GAAG,UAAU,CAgCjH;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,uBAAuB,CAAW,CAAC"}