@nfdi4plants/arctrl 3.1.1 → 3.2.0

package/dist/ts/ts/Json/Process/ProcessParameterValue.js

@@ -1,30 +1,38 @@
 import { encoder, decoder } from '../PropertyValue.js';
 import { ProcessParameterValue } from '../../Core/Process/ProcessParameterValue.js';
-import { map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Exception } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { tryInclude } from '../Encode.js';
 import { ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1 } from './ProtocolParameter.js';
 import { encoder as encoder$1, decoder as decoder$1 } from './Value.js';
 import { OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
-import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { object } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { map } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { object } from '../../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
 
 const ROCrate_encoder = encoder;
 const ROCrate_decoder = decoder((alternateName, measurementMethod, description, category, value, unit) => ProcessParameterValue.createAsPV(alternateName, measurementMethod, description, category, value, unit));
 function ISAJson_genID(oa) {
-  throw new Error("Not implemented");
+  throw new Exception("Not implemented");
 }
 function ISAJson_encoder(idMap, oa) {
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("category", (value) => ISAJson_encoder$1(idMap, value), oa.Category), tryInclude("value", (value_1) => encoder$1(idMap, value_1), oa.Value), tryInclude("unit", (oa_1) => OntologyAnnotation_ISAJson_encoder(idMap, oa_1), oa.Unit)]));
+  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("category", (value) => ISAJson_encoder$1(idMap, value), oa.Category), tryInclude("value", (value_1) => encoder$1(idMap, value_1), oa.Value), tryInclude("unit", (oa_1) => OntologyAnnotation_ISAJson_encoder(idMap, oa_1), oa.Unit)]));
   return {
     Encode(helpers) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values_1);
       return helpers.encodeObject(arg);
     }
   };
 }
 const ISAJson_decoder = object((get$) => {
-  let objectArg, objectArg_1, objectArg_2;
+  let objectArg = void 0, objectArg_1 = void 0, objectArg_2 = void 0;
   return new ProcessParameterValue((objectArg = get$.Optional, objectArg.Field("category", ISAJson_decoder$1)), (objectArg_1 = get$.Optional, objectArg_1.Field("value", decoder$1)), (objectArg_2 = get$.Optional, objectArg_2.Field("unit", OntologyAnnotation_ISAJson_decoder)));
 });
 

package/dist/ts/ts/Json/Process/Protocol.d.ts

@@ -1,7 +1,7 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Protocol } from '../../Core/Process/Protocol.js';
-import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Protocol } from '../../Core/Process/Protocol.ts';
+import { Decoder$1, 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 ROCrate_genID(studyName: Option<string>, assayName: Option<string>, processName: Option<string>, p: Protocol): string;
 export declare function ROCrate_encoder(studyName: Option<string>, assayName: Option<string>, processName: Option<string>, oa: Protocol): IEncodable;
 export declare const ROCrate_decoder: Decoder$1<Protocol>;

package/dist/ts/ts/Json/Process/Protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Protocol.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGnG,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAiBjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CA6EpI;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,GAAG,UAAU,CAiC3I;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,QAAQ,CAI9C,CAAC;AAEH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,GAAG,UAAU,CAoCpL;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,QAAQ,CAG9C,CAAC"}
+{"version":3,"file":"Protocol.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAiC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG9F,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAiBjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CA6EpI;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,GAAG,UAAU,CAyC3I;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,QAAQ,CAI9C,CAAC;AAEH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,GAAG,UAAU,CA4CpL;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,QAAQ,CAG9C,CAAC"}

package/dist/ts/ts/Json/Process/Protocol.js

@@ -1,15 +1,15 @@
-import { value, map, defaultArg } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { replace } from '../../../node_modules/@fable-org/fable-library-js/String.js';
+import { value, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { replace } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
 import { Protocol } from '../../Core/Process/Protocol.js';
-import { choose, ofArray, singleton, empty, append } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { choose, ofArray, singleton, empty, append } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
+import { list } from '../../fable_modules/Thoth.Json.Core.0.9.1/Encode.fs.js';
 import { tryInclude, tryIncludeListOpt } from '../Encode.js';
 import { OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
 import { ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$2 } from './Component.js';
 import { ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$3 } from '../Comment.js';
 import { context_jsonvalue } from '../context/rocrate/isa_protocol_context.js';
-import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { object, list as list$1, string } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { map } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { object, list as list$1, string } from '../../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
 import { Option_fromValueWithDefault } from '../../Core/Helper/Collections.js';
 import { Decode_uri } from '../Decode.js';
 import { ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1 } from './ProtocolParameter.js';
@@ -17,7 +17,7 @@ import { encode } from '../IDTable.js';
 
 function ROCrate_genID(studyName, assayName, processName, p) {
   const matchValue = p.ID;
-  let matchResult, id_1;
+  let matchResult = void 0, id_1 = void 0;
   if (matchValue != null) {
     if (value(matchValue) !== "") {
       matchResult = 0;
@@ -36,7 +36,7 @@ function ROCrate_genID(studyName, assayName, processName, p) {
       if (matchValue_1 == null) {
         const matchValue_2 = p.Name;
         if (matchValue_2 == null) {
-          let matchResult_1, an, pn, sn, pn_1, sn_1, pn_2;
+          let matchResult_1 = void 0, an = void 0, pn = void 0, sn = void 0, pn_1 = void 0, sn_1 = void 0, pn_2 = void 0;
           if (studyName == null) {
             if (assayName == null) {
               if (processName != null) {
@@ -84,10 +84,17 @@ function ROCrate_genID(studyName, assayName, processName, p) {
   }
 }
 function ROCrate_encoder(studyName, assayName, processName, oa) {
-  let value;
-  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(studyName, assayName, processName, 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 = ROCrate_genID(studyName, assayName, processName, oa), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["@type", list(singleton({
     Encode(helpers_1) {
@@ -112,19 +119,26 @@ function ROCrate_encoder(studyName, assayName, processName, oa) {
   }), oa.Version), tryIncludeListOpt("components", ROCrate_encoder$1, oa.Components), tryIncludeListOpt("comments", ROCrate_encoder$2, oa.Comments), ["@context", context_jsonvalue]]));
   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 ROCrate_decoder = object((get$) => {
-  let list_3, list_1, arg_1, objectArg, arg_3, objectArg_1, arg_5, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, arg_19, objectArg_9;
+  let list_3 = void 0, list_1 = void 0, arg_1 = void 0, objectArg = void 0, arg_3 = void 0, objectArg_1 = void 0, arg_5 = void 0, objectArg_2 = void 0, objectArg_3 = void 0, objectArg_4 = void 0, objectArg_5 = void 0, objectArg_6 = void 0, objectArg_7 = void 0, objectArg_8 = void 0, arg_19 = void 0, objectArg_9 = void 0;
   const components = Option_fromValueWithDefault(empty(), (list_3 = (list_1 = defaultArg((arg_1 = list$1(ROCrate_decoder$1), objectArg = get$.Optional, objectArg.Field("components", arg_1)), empty()), append(defaultArg((arg_3 = list$1(ROCrate_decoder$1), objectArg_1 = get$.Optional, objectArg_1.Field("reagents", arg_3)), empty()), list_1)), append(defaultArg((arg_5 = list$1(ROCrate_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("computationalTools", arg_5)), empty()), list_3)));
   return new Protocol((objectArg_3 = get$.Optional, objectArg_3.Field("@id", Decode_uri)), (objectArg_4 = get$.Optional, objectArg_4.Field("name", string)), (objectArg_5 = get$.Optional, objectArg_5.Field("protocolType", OntologyAnnotation_ROCrate_decoderDefinedTerm)), (objectArg_6 = get$.Optional, objectArg_6.Field("description", string)), (objectArg_7 = get$.Optional, objectArg_7.Field("uri", Decode_uri)), (objectArg_8 = get$.Optional, objectArg_8.Field("version", string)), void 0, components, (arg_19 = list$1(ROCrate_decoder$2), objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19)));
 });
 function ISAJson_encoder(studyName, assayName, processName, idMap, oa) {
   const f = (oa_1) => {
-    const values_1 = choose((tupledArg) => map((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);
       }
@@ -147,7 +161,7 @@ function ISAJson_encoder(studyName, assayName, processName, idMap, oa) {
     }), oa_1.Version), tryIncludeListOpt("parameters", (value_10) => ISAJson_encoder$1(idMap, value_10), oa_1.Parameters), tryIncludeListOpt("components", (c) => ISAJson_encoder$2(idMap, c), oa_1.Components), tryIncludeListOpt("comments", (comment) => ISAJson_encoder$3(idMap, comment), oa_1.Comments)]));
     return {
       Encode(helpers_5) {
-        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values_1);
+        const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values_1);
         return helpers_5.encodeObject(arg);
       }
     };
@@ -159,7 +173,7 @@ function ISAJson_encoder(studyName, assayName, processName, idMap, oa) {
   }
 }
 const ISAJson_decoder = 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;
+  let objectArg = 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;
   return new Protocol((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("protocolType", OntologyAnnotation_ISAJson_decoder)), (objectArg_3 = get$.Optional, objectArg_3.Field("description", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("uri", Decode_uri)), (objectArg_5 = get$.Optional, objectArg_5.Field("version", string)), (arg_13 = list$1(ISAJson_decoder$1), objectArg_6 = get$.Optional, objectArg_6.Field("parameters", arg_13)), (arg_15 = list$1(ISAJson_decoder$2), objectArg_7 = get$.Optional, objectArg_7.Field("components", arg_15)), (arg_17 = list$1(ISAJson_decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("comments", arg_17)));
 });
 

package/dist/ts/ts/Json/Process/ProtocolParameter.d.ts

@@ -1,7 +1,7 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { ProtocolParameter } from '../../Core/Process/ProtocolParameter.js';
-import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { ProtocolParameter } from '../../Core/Process/ProtocolParameter.ts';
+import { Decoder$1, 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 encoder(value: ProtocolParameter): IEncodable;
 export declare const decoder: Decoder$1<ProtocolParameter>;
 export declare function ISAJson_genID(p: ProtocolParameter): string;

package/dist/ts/ts/Json/Process/ProtocolParameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProtocolParameter.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/ProtocolParameter.ts"],"names":[],"mappings":"AACA,OAAO,EAA0C,MAAM,EAAc,MAAM,uCAAuC,CAAC;AAEnH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAqB,SAAS,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAOjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,OAAO,CAAC,KAAK,EAAE,iBAAiB,GAAG,UAAU,CAE5D;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,iBAAiB,CAGnB,CAAC;AAE/B,wBAAgB,aAAa,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAQ1D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,GAAG,UAAU,CAoB7G;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,iBAAiB,CAGvD,CAAC"}
+{"version":3,"file":"ProtocolParameter.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/ProtocolParameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,MAAM,EAAc,MAAM,uCAAuC,CAAC;AAErG,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAqB,SAAS,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAQjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,OAAO,CAAC,KAAK,EAAE,iBAAiB,GAAG,UAAU,CAE5D;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,iBAAiB,CAGnB,CAAC;AAE/B,wBAAgB,aAAa,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAQ1D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,GAAG,UAAU,CA4B7G;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,iBAAiB,CAGvD,CAAC"}

package/dist/ts/ts/Json/Process/ProtocolParameter.js

@@ -1,12 +1,13 @@
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_genID, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
-import { defaultArg, unwrap, value, map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { defaultArg, unwrap, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
 import { ProtocolParameter } from '../../Core/Process/ProtocolParameter.js';
-import { map, object } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { map, object } from '../../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
 import { Option_fromValueWithDefault } from '../../Core/Helper/Collections.js';
-import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { concat } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
+import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { tryInclude } from '../Encode.js';
-import { map as map$2 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { encode } from '../IDTable.js';
 
 function encoder(value) {
@@ -21,19 +22,26 @@ function ISAJson_genID(p) {
   if (matchValue == null) {
     return "#EmptyProtocolParameter";
   } else {
-    return `#ProtocolParameter/${OntologyAnnotation_ROCrate_genID(value(matchValue))}`;
+    return concat("#ProtocolParameter/", OntologyAnnotation_ROCrate_genID(value(matchValue)));
   }
 }
 function ISAJson_encoder(idMap, value$1) {
   const f = (value_1) => {
-    const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value_2) => ({
+    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_2) => ({
       Encode(helpers) {
         return helpers.encodeString(value_2);
       }
     }), ISAJson_genID(value_1)), tryInclude("parameterName", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), value_1.ParameterName)]));
     return {
       Encode(helpers_1) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_1)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_1)], values_1);
         return helpers_1.encodeObject(arg);
       }
     };
@@ -45,7 +53,7 @@ function ISAJson_encoder(idMap, value$1) {
   }
 }
 const ISAJson_decoder = object((get$) => {
-  let objectArg;
+  let objectArg = void 0;
   return new ProtocolParameter(void 0, (objectArg = get$.Optional, objectArg.Field("parameterName", OntologyAnnotation_ISAJson_decoder)));
 });
 

package/dist/ts/ts/Json/Process/Sample.d.ts

@@ -1,10 +1,10 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Sample } from '../../Core/Process/Sample.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { MaterialAttributeValue } from '../../Core/Process/MaterialAttributeValue.js';
-import { FactorValue } from '../../Core/Process/FactorValue.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Sample } from '../../Core/Process/Sample.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.9.1/Types.fs.js';
+import { MaterialAttributeValue } from '../../Core/Process/MaterialAttributeValue.ts';
+import { FactorValue } from '../../Core/Process/FactorValue.ts';
+import { IMap } from '@fable-org/fable-library-ts/Util.ts';
 export declare function ROCrate_genID(s: Sample): string;
 export declare function ROCrate_encoder(oa: Sample): IEncodable;
 export declare const ROCrate_additionalPropertyDecoder: Decoder$1<[Option<MaterialAttributeValue>, Option<FactorValue>]>;

package/dist/ts/ts/Json/Process/Sample.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sample.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Sample.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE3G,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAuE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtI,OAAO,EAAE,SAAS,EAA8D,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAE1J,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAahE,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc/C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CA4BtD;AAED,eAAO,MAAM,iCAAiC,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAY9G,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAkE5C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAwB/F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAmG,CAAC;AAEzJ,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAG5C,CAAC"}
+{"version":3,"file":"Sample.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Sample.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE7F,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAuE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtI,OAAO,EAAE,SAAS,EAA8D,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAE1J,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAahE,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc/C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAoCtD;AAED,eAAO,MAAM,iCAAiC,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAY9G,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAuB5C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAgC/F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAmG,CAAC;AAEzJ,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAG5C,CAAC"}

package/dist/ts/ts/Json/Process/Sample.js

@@ -1,15 +1,15 @@
-import { value, defaultArg, map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { replace } from '../../../node_modules/@fable-org/fable-library-js/String.js';
+import { value, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { replace } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
 import { Sample } from '../../Core/Process/Sample.js';
-import { map, empty, append, choose, ofArray, singleton, isEmpty, head, tail } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { map, empty, append, choose, ofArray, singleton, isEmpty, head, tail } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1 } from './MaterialAttributeValue.js';
 import { ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$2 } from './FactorValue.js';
-import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { list } from '../../fable_modules/Thoth.Json.Core.0.9.1/Encode.fs.js';
 import { tryInclude, tryIncludeList, tryIncludeListOpt } from '../Encode.js';
 import { context_jsonvalue } from '../context/rocrate/isa_sample_context.js';
-import { map as map$2 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { string, object, unit, list as list$1 } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
-import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
+import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { string, object, unit, list as list$1 } from '../../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
+import { FSharpResult$2_Error$, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-ts/Result.js';
 import { Decode_uri, Decode_objectNoAdditionalProperties } from '../Decode.js';
 import { Option_fromValueWithDefault } from '../../Core/Helper/Collections.js';
 import { ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$3 } from './Source.js';
@@ -29,11 +29,18 @@ function ROCrate_genID(s) {
   }
 }
 function ROCrate_encoder(oa) {
-  let value_2;
+  let value_2 = void 0;
   let additionalProperties;
   const list_3 = map(ROCrate_encoder$1, defaultArg(oa.Characteristics, empty()));
   additionalProperties = append(map(ROCrate_encoder$2, defaultArg(oa.FactorValues, empty())), list_3);
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value_2 = ROCrate_genID(oa), {
+  const values_1 = choose((tupledArg) => {
+    const option_3 = tupledArg[1];
+    if (option_3 != null) {
+      return [tupledArg[0], value(option_3)];
+    } else {
+      return void 0;
+    }
+  }, ofArray([["@id", (value_2 = ROCrate_genID(oa), {
     Encode(helpers) {
       return helpers.encodeString(value_2);
     }
@@ -52,72 +59,35 @@ function ROCrate_encoder(oa) {
   }), oa.Name), tryIncludeList("additionalProperties", (x) => x, additionalProperties), ["@context", context_jsonvalue]]));
   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 ROCrate_additionalPropertyDecoder = {
   Decode(s, json) {
-    let matchValue;
+    let matchValue = void 0;
     if ((s.hasProperty("additionalType", json) ? (matchValue = string.Decode(s, s.getProperty("additionalType", json)), matchValue.tag === /* Ok */
     0 ? matchValue.fields[0] : "") : "") === "FactorValue") {
       const matchValue_1 = ROCrate_decoder$1.Decode(s, json);
       return matchValue_1.tag === /* Error */
-      1 ? FSharpResult$2_Error(matchValue_1.fields[0]) : FSharpResult$2_Ok([void 0, matchValue_1.fields[0]]);
+      1 ? FSharpResult$2_Error$(matchValue_1.fields[0]) : FSharpResult$2_Ok([void 0, matchValue_1.fields[0]]);
     } else {
       const matchValue_2 = ROCrate_decoder$2.Decode(s, json);
       return matchValue_2.tag === /* Error */
-      1 ? FSharpResult$2_Error(matchValue_2.fields[0]) : FSharpResult$2_Ok([matchValue_2.fields[0], void 0]);
+      1 ? FSharpResult$2_Error$(matchValue_2.fields[0]) : FSharpResult$2_Ok([matchValue_2.fields[0], void 0]);
     }
   }
 };
 const ROCrate_decoder = object((get$) => {
-  let objectArg_5, objectArg_6, arg_15, objectArg_7;
-  let matchValue;
-  const objectArg = get$.Optional;
-  matchValue = objectArg.Field("additionalType", Decode_uri);
-  let matchResult;
-  if (matchValue == null) {
-    matchResult = 0;
-  } else if (value(matchValue) === "Sample") {
-    matchResult = 0;
-  } else {
-    matchResult = 1;
+  let matchValue = void 0, objectArg = void 0, matchValue_1 = void 0, arg_5 = void 0, objectArg_2 = void 0, objectArg_5 = void 0, objectArg_6 = void 0, arg_15 = void 0, objectArg_7 = void 0;
+  if (!(matchValue = (objectArg = get$.Optional, objectArg.Field("additionalType", Decode_uri)), matchValue == null ? true : value(matchValue) === "Sample")) {
+    const objectArg_1 = get$.Required;
+    objectArg_1.Field("FailBecauseNotSample", unit);
   }
-  switch (matchResult) {
-    case 1: {
-      const objectArg_1 = get$.Required;
-      objectArg_1.Field("FailBecauseNotSample", unit);
-      break;
-    }
-  }
-  let matchValue_1;
-  const arg_5 = list$1(string);
-  const objectArg_2 = get$.Optional;
-  matchValue_1 = objectArg_2.Field("@type", arg_5);
-  let matchResult_1;
-  if (matchValue_1 == null) {
-    matchResult_1 = 0;
-  } else if (!isEmpty(value(matchValue_1))) {
-    if (head(value(matchValue_1)) === "Sample") {
-      if (isEmpty(tail(value(matchValue_1)))) {
-        matchResult_1 = 0;
-      } else {
-        matchResult_1 = 1;
-      }
-    } else {
-      matchResult_1 = 1;
-    }
-  } else {
-    matchResult_1 = 1;
-  }
-  switch (matchResult_1) {
-    case 1: {
-      const objectArg_3 = get$.Required;
-      objectArg_3.Field("FailBecauseNotSample", unit);
-      break;
-    }
+  if (!(matchValue_1 = (arg_5 = list$1(string), objectArg_2 = get$.Optional, objectArg_2.Field("@type", arg_5)), matchValue_1 == null ? true : !isEmpty(value(matchValue_1)) && (head(value(matchValue_1)) === "Sample" && isEmpty(tail(value(matchValue_1)))))) {
+    const objectArg_3 = get$.Required;
+    objectArg_3.Field("FailBecauseNotSample", unit);
   }
   let additionalProperties;
   const arg_9 = list$1(ROCrate_additionalPropertyDecoder);
@@ -134,7 +104,14 @@ const ROCrate_decoder = object((get$) => {
 });
 function ISAJson_encoder(idMap, oa) {
   const f = (oa_1) => {
-    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);
       }
@@ -145,7 +122,7 @@ function ISAJson_encoder(idMap, oa) {
     }), oa_1.Name), tryIncludeListOpt("characteristics", (oa_2) => ISAJson_encoder$1(idMap, oa_2), oa_1.Characteristics), tryIncludeListOpt("factorValues", (fv) => ISAJson_encoder$2(idMap, fv), oa_1.FactorValues), tryIncludeListOpt("derivesFrom", (oa_3) => ISAJson_encoder$3(idMap, oa_3), oa_1.DerivesFrom)]));
     return {
       Encode(helpers_2) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
         return helpers_2.encodeObject(arg);
       }
     };
@@ -158,7 +135,7 @@ function ISAJson_encoder(idMap, oa) {
 }
 const ISAJson_allowedFields = ofArray(["@id", "name", "characteristics", "factorValues", "derivesFrom", "@type", "@context"]);
 const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
-  let objectArg, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
+  let objectArg = void 0, objectArg_1 = void 0, arg_5 = void 0, objectArg_2 = void 0, arg_7 = void 0, objectArg_3 = void 0, arg_9 = void 0, objectArg_4 = void 0;
   return new Sample((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (arg_5 = list$1(ISAJson_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("characteristics", arg_5)), (arg_7 = list$1(ISAJson_decoder$2), objectArg_3 = get$.Optional, objectArg_3.Field("factorValues", arg_7)), (arg_9 = list$1(ISAJson_decoder$3), objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9)));
 });
 

package/dist/ts/ts/Json/Process/Source.d.ts

@@ -1,8 +1,8 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Source } from '../../Core/Process/Source.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { IMap } from '@fable-org/fable-library-js/Util.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Source } from '../../Core/Process/Source.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { Decoder$1, 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 ROCrate_genID(s: Source): string;
 export declare function ROCrate_encoder(oa: Source): IEncodable;
 export declare const ROCrate_decoder: Decoder$1<Source>;

package/dist/ts/ts/Json/Process/Source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Source.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGtF,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAuB,UAAU,EAA8B,MAAM,qCAAqC,CAAC;AAClH,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAWjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc/C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAyBtD;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAsD5C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAwB/F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAoE,CAAC;AAE1H,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAG5C,CAAC"}
+{"version":3,"file":"Source.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Source.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAuB,UAAU,EAA8B,MAAM,qCAAqC,CAAC;AAClH,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAUjH,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc/C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAiCtD;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAW5C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAgC/F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAoE,CAAC;AAE1H,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,MAAM,CAG5C,CAAC"}

package/dist/ts/ts/Json/Process/Source.js

@@ -1,14 +1,14 @@
-import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { replace } from '../../../node_modules/@fable-org/fable-library-js/String.js';
+import { value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { replace } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
 import { URIModule_toString } from '../../Core/URI.js';
 import { Source } from '../../Core/Process/Source.js';
-import { choose, ofArray, singleton, isEmpty, head, tail } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { choose, ofArray, singleton, isEmpty, head, tail } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
+import { list } from '../../fable_modules/Thoth.Json.Core.0.9.1/Encode.fs.js';
 import { tryInclude, tryIncludeListOpt } from '../Encode.js';
 import { ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1 } from './MaterialAttributeValue.js';
 import { context_jsonvalue } from '../context/rocrate/isa_source_context.js';
-import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { object, unit, list as list$1, string } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { map } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { object, unit, list as list$1, string } from '../../fable_modules/Thoth.Json.Core.0.9.1/Decode.fs.js';
 import { Decode_uri, Decode_objectNoAdditionalProperties } from '../Decode.js';
 import { encode } from '../IDTable.js';
 
@@ -26,10 +26,17 @@ function ROCrate_genID(s) {
   }
 }
 function ROCrate_encoder(oa) {
-  let value;
-  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;
+  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(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value);
+      return helpers.encodeString(value$1);
     }
   })], ["@type", list(singleton({
     Encode(helpers_1) {
@@ -46,63 +53,33 @@ function ROCrate_encoder(oa) {
   }), oa.Name), tryIncludeListOpt("characteristics", ROCrate_encoder$1, oa.Characteristics), ["@context", context_jsonvalue]]));
   return {
     Encode(helpers_4) {
-      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
+      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values_1);
       return helpers_4.encodeObject(arg);
     }
   };
 }
 const ROCrate_decoder = object((get$) => {
-  let objectArg_4, objectArg_5, arg_13, objectArg_6;
-  let matchValue;
-  const objectArg = get$.Optional;
-  matchValue = objectArg.Field("additionalType", Decode_uri);
-  let matchResult;
-  if (matchValue == null) {
-    matchResult = 0;
-  } else if (value(matchValue) === "Source") {
-    matchResult = 0;
-  } else {
-    matchResult = 1;
+  let matchValue = void 0, objectArg = void 0, matchValue_1 = void 0, arg_5 = void 0, objectArg_2 = void 0, objectArg_4 = void 0, objectArg_5 = void 0, arg_13 = void 0, objectArg_6 = void 0;
+  if (!(matchValue = (objectArg = get$.Optional, objectArg.Field("additionalType", Decode_uri)), matchValue == null ? true : value(matchValue) === "Source")) {
+    const objectArg_1 = get$.Required;
+    objectArg_1.Field("FailBecauseNotSample", unit);
   }
-  switch (matchResult) {
-    case 1: {
-      const objectArg_1 = get$.Required;
-      objectArg_1.Field("FailBecauseNotSample", unit);
-      break;
-    }
-  }
-  let matchValue_1;
-  const arg_5 = list$1(string);
-  const objectArg_2 = get$.Optional;
-  matchValue_1 = objectArg_2.Field("@type", arg_5);
-  let matchResult_1;
-  if (matchValue_1 == null) {
-    matchResult_1 = 0;
-  } else if (!isEmpty(value(matchValue_1))) {
-    if (head(value(matchValue_1)) === "Source") {
-      if (isEmpty(tail(value(matchValue_1)))) {
-        matchResult_1 = 0;
-      } else {
-        matchResult_1 = 1;
-      }
-    } else {
-      matchResult_1 = 1;
-    }
-  } else {
-    matchResult_1 = 1;
-  }
-  switch (matchResult_1) {
-    case 1: {
-      const objectArg_3 = get$.Required;
-      objectArg_3.Field("FailBecauseNotSample", unit);
-      break;
-    }
+  if (!(matchValue_1 = (arg_5 = list$1(string), objectArg_2 = get$.Optional, objectArg_2.Field("@type", arg_5)), matchValue_1 == null ? true : !isEmpty(value(matchValue_1)) && (head(value(matchValue_1)) === "Source" && isEmpty(tail(value(matchValue_1)))))) {
+    const objectArg_3 = get$.Required;
+    objectArg_3.Field("FailBecauseNotSample", unit);
   }
   return new Source((objectArg_4 = get$.Optional, objectArg_4.Field("@id", Decode_uri)), (objectArg_5 = get$.Optional, objectArg_5.Field("name", string)), (arg_13 = list$1(ROCrate_decoder$1), objectArg_6 = get$.Optional, objectArg_6.Field("characteristics", arg_13)));
 });
 function ISAJson_encoder(idMap, oa) {
   const f = (oa_1) => {
-    const values_1 = choose((tupledArg) => map((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);
       }
@@ -113,7 +90,7 @@ function ISAJson_encoder(idMap, oa) {
     }), oa_1.Name), tryIncludeListOpt("characteristics", (oa_2) => ISAJson_encoder$1(idMap, oa_2), oa_1.Characteristics)]));
     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);
       }
     };
@@ -126,7 +103,7 @@ function ISAJson_encoder(idMap, oa) {
 }
 const ISAJson_allowedFields = ofArray(["@id", "name", "characteristics", "@type", "@context"]);
 const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (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 new Source((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (arg_5 = list$1(ISAJson_decoder$1), objectArg_2 = get$.Optional, objectArg_2.Field("characteristics", arg_5)));
 });