@nfdi4plants/arctrl 3.2.3 → 3.3.1

package/dist/ts/ts/FileSystem/Path.js

@@ -1,8 +1,8 @@
 import { ofArray } from '../../node_modules/@fable-org/fable-library-ts/List.js';
-import { split as split$1, substring, concat, join, trimEnd, trimStart, trim } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { split as split$1, getCharAtIndex, substring, concat, join, trimEnd, trimStart, trim } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { isMatch } from '../../node_modules/@fable-org/fable-library-ts/RegExp.js';
 import { isLetter } from '../../node_modules/@fable-org/fable-library-ts/Char.js';
-import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { mapIndexed, item, append, last } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { mapIndexed, item, append, fill, last } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 
 const seperators = ["/", "\\"];
 const alternativeLICENSEFileNames = ofArray(["LICENSE.txt", "LICENSE.md", "LICENSE.rst"]);
@@ -16,12 +16,15 @@ function split(path) {
     }
   });
 }
+function hasUriScheme(path) {
+  return isMatch(/^[A-Za-z][A-Za-z0-9+.\-]+:/gu, path.trim());
+}
 function hasLeadingSeparator(path) {
   if (path.length > 0) {
-    if (path[0] === "/") {
+    if (getCharAtIndex(path, 0) === "/") {
       return true;
     } else {
-      return path[0] === "\\";
+      return getCharAtIndex(path, 0) === "\\";
     }
   } else {
     return false;
@@ -35,7 +38,7 @@ function isUncPath(path) {
   }
 }
 function tryGetDrivePrefix(path) {
-  if (path.length > 2 && isLetter(path[0]) && path[1] === ":" && (path[2] === "/" ? true : path[2] === "\\")) {
+  if (path.length > 2 && isLetter(getCharAtIndex(path, 0)) && getCharAtIndex(path, 1) === ":" && (getCharAtIndex(path, 2) === "/" ? true : getCharAtIndex(path, 2) === "\\")) {
     return substring(path, 0, 2);
   } else {
     return void 0;
@@ -53,7 +56,7 @@ function splitWithPrefix(path) {
       return [void 0, split(trimmed)];
     }
   } else {
-    return [value(matchValue), split(substring(trimmed, 2))];
+    return [matchValue, split(substring(trimmed, 2))];
   }
 }
 function normalizeRootPrefix(prefix) {
@@ -71,7 +74,7 @@ function buildPathFromPrefixAndSegments(prefixOpt, segments) {
     if (prefixOpt == null) {
       return "";
     } else {
-      return normalizeRootPrefix(value(prefixOpt));
+      return normalizeRootPrefix(prefixOpt);
     }
   } else {
     const combined = join("/", segments);
@@ -79,27 +82,27 @@ function buildPathFromPrefixAndSegments(prefixOpt, segments) {
     if (prefixOpt == null) {
       matchResult = 4;
     } else {
-      switch (value(prefixOpt)) {
+      switch (prefixOpt) {
         case "//": {
           matchResult = 0;
           break;
         }
         case "/": {
-          if (prefix_1 = value(prefixOpt), prefix_1.endsWith(":")) {
+          if (prefix_1 = prefixOpt, prefix_1.endsWith(":")) {
             matchResult = 1;
-            prefix_3 = value(prefixOpt);
+            prefix_3 = prefixOpt;
           } else {
             matchResult = 2;
           }
           break;
         }
         default:
-          if (prefix_2 = value(prefixOpt), prefix_2.endsWith(":")) {
+          if (prefix_2 = prefixOpt, prefix_2.endsWith(":")) {
             matchResult = 1;
-            prefix_3 = value(prefixOpt);
+            prefix_3 = prefixOpt;
           } else {
             matchResult = 3;
-            prefix_4 = value(prefixOpt);
+            prefix_4 = prefixOpt;
           }
       }
     }
@@ -153,12 +156,17 @@ function normalize(path) {
   const trimmedPath = path.trim();
   const patternInput = splitWithPrefix(trimmedPath);
   const prefixOpt = patternInput[0];
-  const normalizedSegments = normalizeSegments(patternInput[1]);
+  const pathSegments = patternInput[1];
+  const normalizedSegments = normalizeSegments(pathSegments);
   if (normalizedSegments.length === 0) {
     if (prefixOpt == null) {
-      return trimmedPath;
+      if (pathSegments.length > 0) {
+        return ".";
+      } else {
+        return trimmedPath;
+      }
     } else {
-      return normalizeRootPrefix(value(prefixOpt));
+      return normalizeRootPrefix(prefixOpt);
     }
   } else {
     return buildPathFromPrefixAndSegments(prefixOpt, normalizedSegments);
@@ -191,13 +199,23 @@ function resolvePathFromFile(filePath, path) {
       if (filePrefixOpt == null) {
         return trimmedPath;
       } else {
-        return normalizeRootPrefix(value(filePrefixOpt));
+        return normalizeRootPrefix(filePrefixOpt);
       }
     } else {
       return buildPathFromPrefixAndSegments(filePrefixOpt, resolvedSegments);
     }
   }
 }
+function getRelativePathFromFile(filePath, path) {
+  const fileSegments = normalizeSegments(split(filePath));
+  const directorySegments = fileSegments.length <= 1 ? [] : fileSegments.slice(0, fileSegments.length - 2 + 1);
+  const pathSegments = normalizeSegments(split(path));
+  let common = 0;
+  while (common < directorySegments.length && common < pathSegments.length - 1 && item(common, directorySegments) === item(common, pathSegments)) {
+    common = common + 1 | 0;
+  }
+  return join("/", append(fill(new Array(directorySegments.length - common), 0, directorySegments.length - common, ".."), pathSegments.slice(common, pathSegments.length)));
+}
 function getFileName(path) {
   return last(split(path));
 }
@@ -217,4 +235,4 @@ function getRunFolderPath(runIdentifier) {
   return combine("runs", runIdentifier);
 }
 
-export { alternativeLICENSEFileNames, buildPathFromPrefixAndSegments, combine, combineMany, getAssayFolderPath, getFileName, getRunFolderPath, getStudyFolderPath, getWorkflowFolderPath, hasLeadingSeparator, isFile, isUncPath, normalize, normalizePathKey, normalizeRootPrefix, normalizeSegments, resolvePathFromFile, seperators, split, splitWithPrefix, tryGetDrivePrefix };
+export { alternativeLICENSEFileNames, buildPathFromPrefixAndSegments, combine, combineMany, getAssayFolderPath, getFileName, getRelativePathFromFile, getRunFolderPath, getStudyFolderPath, getWorkflowFolderPath, hasLeadingSeparator, hasUriScheme, isFile, isUncPath, normalize, normalizePathKey, normalizeRootPrefix, normalizeSegments, resolvePathFromFile, seperators, split, splitWithPrefix, tryGetDrivePrefix };

package/dist/ts/ts/Json/Assay.js

@@ -1,5 +1,5 @@
 import { choose, ofArray, singleton, 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 { unwrap, defaultArg, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { tryInclude, tryIncludeSeq, tryIncludeList } from './Encode.js';
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_encoderPropertyValue, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderPropertyValue, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from './OntologyAnnotation.js';
 import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './Datamap/Datamap.js';
@@ -25,17 +25,17 @@ import { encode } from './IDTable.js';
 import { Decode_objectNoAdditionalProperties } from './Decode.js';
 
 function encoder(assay) {
-  let value$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["Identifier", (value$1 = assay.Identifier, {
+  }, ofArray([["Identifier", (value = assay.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -58,17 +58,17 @@ const decoder = object((get$) => {
   return ArcAssay.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(decoder$1), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("Datamap", decoder$2))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Performers", arg_17))), unwrap((arg_19 = resizeArray(decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("Comments", arg_19))));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, assay) {
-  let value$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["Identifier", (value$1 = assay.Identifier, {
+  }, ofArray([["Identifier", (value = assay.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -101,20 +101,20 @@ function ROCrate_genID(a) {
   }
 }
 function ROCrate_encoder(assayName, a) {
-  let value$1 = void 0, value_3 = void 0, assayName_1 = void 0;
+  let value = void 0, value_3 = void 0, assayName_1 = void 0;
   const fileName = Assay_fileNameFromIdentifier(a.Identifier);
   const processes = ARCtrl_ArcTables__ArcTables_GetProcesses(a);
   const dataFiles = getData(processes);
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["@id", (value$1 = ROCrate_genID(a), {
+  }, ofArray([["@id", (value = ROCrate_genID(a), {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], ["@type", list(singleton({
     Encode(helpers_1) {
@@ -156,7 +156,7 @@ const ROCrate_decoder = object((get$) => {
   const arg_3 = list$1(ROCrate_decoder$1);
   const objectArg_1 = get$.Optional;
   option_2 = objectArg_1.Field("processSequence", arg_3);
-  tables = option_2 != null ? (a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(value(option_2)), a.Tables) : void 0;
+  tables = option_2 != null ? (a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(option_2), a.Tables) : void 0;
   return new ArcAssay(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("measurementType", OntologyAnnotation_ROCrate_decoderPropertyValue))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("technologyType", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("technologyPlatform", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap(tables), void 0, unwrap((arg_16 = resizeArray(ROCrate_decoder$2), objectArg_7 = get$.Optional, objectArg_7.Field("performers", arg_16))), unwrap((arg_18 = resizeArray(ROCrate_decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("comments", arg_18))));
 });
 function ISAJson_encoder(studyName, idMap, a) {
@@ -173,7 +173,7 @@ function ISAJson_encoder(studyName, idMap, a) {
     const values_1 = choose((tupledArg) => {
       const option_3 = tupledArg[1];
       if (option_3 != null) {
-        return [tupledArg[0], value(option_3)];
+        return [tupledArg[0], option_3];
       } else {
         return void 0;
       }
@@ -189,7 +189,7 @@ function ISAJson_encoder(studyName, idMap, a) {
       Encode(helpers_2) {
         return helpers_2.encodeString(value_7);
       }
-    }), (option_1 = a_1.TechnologyPlatform, option_1 != null ? JsonTypes_composeTechnologyPlatform(value(option_1)) : void 0)), encocedDataFiles, encodedMaterials, encodedCharacteristics, encodedUnits, tryIncludeList("processSequence", (assayName = a_1.Identifier, (oa_4) => ISAJson_encoder$2(studyName, assayName, idMap, oa_4)), processes), tryIncludeSeq("comments", (comment) => ISAJson_encoder$3(idMap, comment), comments)]));
+    }), (option_1 = a_1.TechnologyPlatform, option_1 != null ? JsonTypes_composeTechnologyPlatform(option_1) : void 0)), encocedDataFiles, encodedMaterials, encodedCharacteristics, encodedUnits, tryIncludeList("processSequence", (assayName = a_1.Identifier, (oa_4) => ISAJson_encoder$2(studyName, assayName, idMap, oa_4)), processes), tryIncludeSeq("comments", (comment) => ISAJson_encoder$3(idMap, comment), comments)]));
     return {
       Encode(helpers_3) {
         const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
@@ -198,7 +198,7 @@ function ISAJson_encoder(studyName, idMap, a) {
     };
   };
   if (idMap != null) {
-    return encode(ROCrate_genID, f, a, value(idMap));
+    return encode(ROCrate_genID, f, a, idMap);
   } else {
     return f(a);
   }
@@ -206,13 +206,13 @@ function ISAJson_encoder(studyName, idMap, a) {
 const ISAJson_allowedFields = ofArray(["@id", "filename", "measurementType", "technologyType", "technologyPlatform", "dataFiles", "materials", "characteristicCategories", "unitCategories", "processSequence", "comments", "@type", "@context"]);
 const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
   let option_1 = void 0, objectArg = void 0, a = void 0, objectArg_3 = void 0, objectArg_4 = void 0, arg_12 = void 0, objectArg_5 = void 0;
-  const identifier = defaultArg((option_1 = (objectArg = get$.Optional, objectArg.Field("filename", string)), option_1 != null ? Assay_tryIdentifierFromFileName(value(option_1)) : void 0), createMissingIdentifier());
+  const identifier = defaultArg((option_1 = (objectArg = get$.Optional, objectArg.Field("filename", string)), option_1 != null ? Assay_tryIdentifierFromFileName(option_1) : void 0), createMissingIdentifier());
   let tables;
   let option_4;
   const arg_3 = list$1(ISAJson_decoder$1);
   const objectArg_1 = get$.Optional;
   option_4 = objectArg_1.Field("processSequence", arg_3);
-  tables = option_4 != null ? (a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(value(option_4)), a.Tables) : void 0;
+  tables = option_4 != null ? (a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(option_4), a.Tables) : void 0;
   let comments;
   const arg_6 = resizeArray(ISAJson_decoder$2);
   const objectArg_2 = get$.Optional;
@@ -225,7 +225,7 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
     } else {
       return void 0;
     }
-  }, value(option_6)) : void 0;
+  }, option_6) : void 0;
   let description;
   const option_8 = comments;
   description = option_8 != null ? tryPick((x_1) => {
@@ -234,7 +234,7 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
     } else {
       return void 0;
     }
-  }, value(option_8)) : void 0;
+  }, option_8) : void 0;
   let comments_1;
   const option_10 = comments;
   if (option_10 != null) {
@@ -246,7 +246,7 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
       } else {
         return false;
       }
-    }, value(option_10));
+    }, option_10);
     comments_1 = length(matchValue) === 0 ? void 0 : matchValue;
   } else {
     comments_1 = void 0;

package/dist/ts/ts/Json/Comment.js

@@ -1,5 +1,5 @@
 import { choose, ofArray } from '../../node_modules/@fable-org/fable-library-ts/List.js';
-import { value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { tryInclude } from './Encode.js';
 import { map } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { Comment$ } from '../Core/Comment.js';
@@ -13,7 +13,7 @@ function encoder(comment) {
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
@@ -42,23 +42,23 @@ function ROCrate_genID(c) {
   if (matchValue == null) {
     return "#EmptyComment";
   } else {
-    const n = value(matchValue);
+    const n = matchValue;
     const v = c.Value != null ? "_" + replace(value(c.Value), " ", "_") : "";
     return "#Comment_" + replace(n, " ", "_") + v;
   }
 }
 function ROCrate_encoder(comment) {
-  let value$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["@id", (value$1 = ROCrate_genID(comment), {
+  }, ofArray([["@id", (value = ROCrate_genID(comment), {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], ["@type", {
     Encode(helpers_1) {
@@ -98,7 +98,7 @@ function ISAJson_encoder(idMap, comment) {
     const values_1 = choose((tupledArg) => {
       const option_1 = tupledArg[1];
       if (option_1 != null) {
-        return [tupledArg[0], value(option_1)];
+        return [tupledArg[0], option_1];
       } else {
         return void 0;
       }
@@ -125,7 +125,7 @@ function ISAJson_encoder(idMap, comment) {
   if (idMap == null) {
     return f(comment);
   } else {
-    return encode(ROCrate_genID, f, comment, value(idMap));
+    return encode(ROCrate_genID, f, comment, idMap);
   }
 }
 const ISAJson_decoder = decoder;

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

@@ -1 +1 @@
-{"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA8B,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAA4B,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAO9G,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAO7D,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,GAAG,UAAU,CAgC3C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,IAAI,CAGlC,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,UAAU,CAgBvF;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAKpF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,CAc7C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,IAAI,GAAG,UAAU,CAqCpD;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAG1C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,UAAU,CAgC7F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAqE,CAAC;AAE3H,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAG1C,CAAC"}
+{"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA8B,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAU,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAO9G,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAO7D,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,GAAG,UAAU,CAgC3C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,IAAI,CAGlC,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,UAAU,CAgBvF;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAKpF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,CAc7C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,IAAI,GAAG,UAAU,CAqCpD;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAG1C,CAAC;AAEH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,UAAU,CAgC7F;AAED,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAAC,MAAM,CAAqE,CAAC;AAE3H,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAG1C,CAAC"}

package/dist/ts/ts/Json/Data.js

@@ -1,5 +1,5 @@
 import { choose, ofArray, singleton } from '../../node_modules/@fable-org/fable-library-ts/List.js';
-import { value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
 import { ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$1 } from './DataFile.js';
 import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$2 } from './Comment.js';
@@ -18,7 +18,7 @@ function encoder(d) {
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
@@ -54,7 +54,7 @@ function compressedEncoder(stringTable, d) {
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
@@ -79,24 +79,24 @@ function ROCrate_genID(d) {
     if (matchValue_1 == null) {
       return "#EmptyData";
     } else {
-      return replace(value(matchValue_1), " ", "_");
+      return replace(matchValue_1, " ", "_");
     }
   } else {
-    return URIModule_toString(value(matchValue));
+    return URIModule_toString(matchValue);
   }
 }
 function ROCrate_encoder(oa) {
-  let value$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["@id", (value$1 = ROCrate_genID(oa), {
+  }, ofArray([["@id", (value = ROCrate_genID(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], ["@type", list(singleton({
     Encode(helpers_1) {
@@ -131,7 +131,7 @@ function ISAJson_encoder(idMap, oa) {
     const values_1 = choose((tupledArg) => {
       const option_1 = tupledArg[1];
       if (option_1 != null) {
-        return [tupledArg[0], value(option_1)];
+        return [tupledArg[0], option_1];
       } else {
         return void 0;
       }
@@ -152,7 +152,7 @@ function ISAJson_encoder(idMap, oa) {
     };
   };
   if (idMap != null) {
-    return encode(ROCrate_genID, f, oa, value(idMap));
+    return encode(ROCrate_genID, f, oa, idMap);
   } else {
     return f(oa);
   }

package/dist/ts/ts/Json/Datamap/DataContext.js

@@ -1,5 +1,5 @@
 import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
-import { value, unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { encoder as encoder$1, decoder as decoder$1 } from '../Data.js';
 import { tryInclude } from '../Encode.js';
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder } from '../OntologyAnnotation.js';
@@ -11,7 +11,7 @@ function encoder(dc) {
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Decode.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Decode.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,SAAS,EAAE,iBAAiB,EAA6B,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AACvM,OAAO,EAAe,QAAQ,EAAuE,MAAM,qDAAqD,CAAC;AAEjK,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAS,SAAS,EAAY,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,IAAI,EAA0E,MAAM,qCAAqC,CAAC;AACnI,OAAO,EAA4C,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAO3G,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAG7J;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,eAAO,MAAM,UAAU,EAAE,SAAS,CAAC,MAAM,CAcxC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAElJ;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAuBtJ;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAUrI;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CA8BlG;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAc3C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAkCrI;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CA+BzG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAiC/F"}
+{"version":3,"file":"Decode.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Json/Decode.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,SAAS,EAAE,iBAAiB,EAA6B,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AACvM,OAAO,EAAe,QAAQ,EAAuE,MAAM,qDAAqD,CAAC;AAEjK,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAS,SAAS,EAAY,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,IAAI,EAA0E,MAAM,qCAAqC,CAAC;AACnI,OAAO,EAA4C,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAO3G,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAG7J;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,eAAO,MAAM,UAAU,EAAE,SAAS,CAAC,MAAM,CAcxC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAElJ;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAuBtJ;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAUrI;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CA8BlG;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,IAAI,CAY3C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAkCrI;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CA+BzG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAiC/F"}

package/dist/ts/ts/Json/Decode.js

@@ -7,8 +7,8 @@ import { contains, ofSeq } from '../../node_modules/@fable-org/fable-library-ts/
 import { comparePrimitives, int32ToString, structuralHash, equals } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { isEmpty, length, head, empty, cons, tail } from '../../node_modules/@fable-org/fable-library-ts/List.js';
 import { fold } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
-import { minValue, tryParse } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
 import { FSharpRef } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { minValue, tryParse } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
 import { Dictionary } from '../../node_modules/@fable-org/fable-library-ts/MutableMap.js';
 import { addToDict } from '../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 
@@ -103,10 +103,8 @@ const Decode_datetime = {
   Decode(helpers, value) {
     if (helpers.isString(value)) {
       let matchValue;
-      let outArg = minValue();
-      matchValue = [tryParse(helpers.asString(value), new FSharpRef(() => outArg, (v) => {
-        outArg = v;
-      })), outArg];
+      const cell = new FSharpRef(minValue());
+      matchValue = [tryParse(helpers.asString(value), cell), cell.contents];
       return matchValue[0] ? FSharpResult$2_Ok(matchValue[1]) : FSharpResult$2_Error$(["", ErrorReason$1_BadPrimitive("a datetime", value)]);
     } else {
       return FSharpResult$2_Error$(["", ErrorReason$1_BadPrimitive("a datetime", value)]);

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

@@ -28,9 +28,9 @@ function tryIncludeArray(name, encoder, value) {
 function tryIncludeList(name, encoder, value) {
   return [name, isEmpty$1(value) ? void 0 : list(map$2(encoder, value))];
 }
-function tryIncludeListOpt(name, encoder, value$1) {
+function tryIncludeListOpt(name, encoder, value) {
   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];
+  return [name, value != null ? (o = value, isEmpty$1(o) ? void 0 : list(map$2(encoder, o))) : void 0];
 }
 const DefaultSpaces = 0;
 function defaultSpaces(spaces) {

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":"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"}
+{"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,EAAsB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACnF,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-ts/List.js';
-import { value, unwrap, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { 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';
@@ -19,17 +19,17 @@ import { conformsTo_jsonvalue, context_jsonvalue as context_jsonvalue$1 } from '
 import { Decode_objectNoAdditionalProperties } from './Decode.js';
 
 function encoder(inv) {
-  let value$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["Identifier", (value$1 = inv.Identifier, {
+  }, ofArray([["Identifier", (value = inv.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -64,17 +64,17 @@ const decoder = object((get$) => {
   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$1 = void 0;
+  let value = void 0;
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["Identifier", (value$1 = inv.Identifier, {
+  }, ofArray([["Identifier", (value = inv.Identifier, {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], tryInclude("Title", (value_1) => ({
     Encode(helpers_1) {
@@ -114,17 +114,17 @@ function ROCrate_genID(i) {
   return "./";
 }
 function ROCrate_encoder(oa) {
-  let value$1 = void 0, value_3 = void 0, value_4 = void 0, value_12 = void 0, copyOfStruct = void 0;
+  let value = 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)];
+      return [tupledArg[0], option_2];
     } else {
       return void 0;
     }
-  }, ofArray([["@id", (value$1 = ROCrate_genID(oa), {
+  }, ofArray([["@id", (value = ROCrate_genID(oa), {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], ["@type", {
     Encode(helpers_1) {
@@ -172,7 +172,7 @@ const ROCrate_decoder = object((get$) => {
   let matchValue;
   const objectArg = get$.Optional;
   matchValue = objectArg.Field("identifier", string);
-  identifier = matchValue == null ? createMissingIdentifier() : value(matchValue);
+  identifier = matchValue == null ? createMissingIdentifier() : matchValue;
   const patternInput = unzip(defaultArg((arg_3 = list(ROCrate_decoder$1), objectArg_1 = get$.Optional, objectArg_1.Field("studies", arg_3)), empty()));
   const studiesRaw = patternInput[0];
   let assays;
@@ -191,7 +191,7 @@ function ROCrate_encodeRoCrate(oa) {
   const values_1 = choose((tupledArg) => {
     const option_1 = tupledArg[1];
     if (option_1 != null) {
-      return [tupledArg[0], value(option_1)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
@@ -213,17 +213,17 @@ function ROCrate_encodeRoCrate(oa) {
 }
 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$1 = void 0, value_1 = void 0, value_2 = void 0;
+  let value = 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)];
+      return [tupledArg[0], option_1];
     } else {
       return void 0;
     }
-  }, ofArray([["@id", (value$1 = ROCrate_genID(inv), {
+  }, ofArray([["@id", (value = ROCrate_genID(inv), {
     Encode(helpers) {
-      return helpers.encodeString(value$1);
+      return helpers.encodeString(value);
     }
   })], ["filename", (value_1 = ArcInvestigation.FileName, {
     Encode(helpers_1) {
@@ -263,7 +263,7 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
   let matchValue;
   const objectArg = get$.Optional;
   matchValue = objectArg.Field("identifier", string);
-  identifer = matchValue == null ? createMissingIdentifier() : value(matchValue);
+  identifer = matchValue == null ? createMissingIdentifier() : matchValue;
   const patternInput = unzip(defaultArg((arg_3 = list(ISAJson_decoder$1), objectArg_1 = get$.Optional, objectArg_1.Field("studies", arg_3)), empty()));
   const studiesRaw = patternInput[0];
   let assays;

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":"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"}
+{"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,EAAU,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAKvE,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"}