@nfdi4plants/arctrl 3.0.0-beta.9 → 3.0.0

package/dist/ts/ts/FileSystem/FileSystemTree.js

@@ -1,7 +1,7 @@
 import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryFind, item, tryPick, head, tail, map, equalsWith, choose, append as append$1 } from '../../node_modules/@fable-org/fable-library-js/Array.js';
 import { split, combineMany } from './Path.js';
-import { toArray, delay, append, singleton } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { toArray, delay, append, singleton, empty as empty$1 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { Array_groupBy, Array_distinct } from '../../node_modules/@fable-org/fable-library-js/Seq2.js';
 import { stringHash, arrayHash, curry2 } from '../../node_modules/@fable-org/fable-library-js/Util.js';
 import { cons, toArray as toArray$1, reverse, empty } from '../../node_modules/@fable-org/fable-library-js/List.js';
@@ -272,53 +272,46 @@ class FileSystemTree extends Union {
   static createEmptyFolder(name) {
     return FileSystemTree.createFolder(name, [FileSystemTree.createGitKeepFile()]);
   }
-  static createAssayFolder(assayName, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createAssayFolder(assayName, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
     const dataset = FileSystemTree.createEmptyFolder("dataset");
     const protocols = FileSystemTree.createEmptyFolder("protocols");
     const readme = FileSystemTree.createReadmeFile();
     const assayFile = FileSystemTree.createFile("isa.assay.xlsx");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme, dataMapFile]);
+    if (hasDatamap_1) {
+      const datamapFile = FileSystemTree.createFile("isa.datamap.xlsx");
+      return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme, datamapFile]);
     } else {
       return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme]);
     }
   }
-  static createStudyFolder(studyName, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createStudyFolder(studyName, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
     const resources = FileSystemTree.createEmptyFolder("resources");
     const protocols = FileSystemTree.createEmptyFolder("protocols");
     const readme = FileSystemTree.createReadmeFile();
     const studyFile = FileSystemTree.createFile("isa.study.xlsx");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme, dataMapFile]);
+    if (hasDatamap_1) {
+      const datamapFile = FileSystemTree.createFile("isa.datamap.xlsx");
+      return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme, datamapFile]);
     } else {
       return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme]);
     }
   }
-  static createWorkflowFolder(workflowName, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createWorkflowFolder(workflowName, hasCWL, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
+    const hasCWL_1 = defaultArg(hasCWL, false);
     const readme = FileSystemTree.createReadmeFile();
     const workflowFile = FileSystemTree.createFile("isa.workflow.xlsx");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(workflowName, [workflowFile, readme, dataMapFile]);
-    } else {
-      return FileSystemTree.createFolder(workflowName, [workflowFile, readme]);
-    }
+    return FileSystemTree.createFolder(workflowName, toArray(delay(() => append(singleton(workflowFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("workflow.cwl")) : empty$1(), delay(() => hasDatamap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))));
   }
-  static createRunFolder(runName, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createRunFolder(runName, hasCWL, hasYML, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
+    const hasCWL_1 = defaultArg(hasCWL, false);
+    const hasYML_1 = defaultArg(hasYML, false);
     const readme = FileSystemTree.createReadmeFile();
     const runFile = FileSystemTree.createFile("isa.run.xlsx");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(runName, [runFile, readme, dataMapFile]);
-    } else {
-      return FileSystemTree.createFolder(runName, [runFile, readme]);
-    }
+    return FileSystemTree.createFolder(runName, toArray(delay(() => append(singleton(runFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("run.cwl")) : empty$1(), delay(() => append(hasYML_1 ? singleton(FileSystemTree.createFile("run.yml")) : empty$1(), delay(() => hasDatamap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))))));
   }
   static createInvestigationFile() {
     return FileSystemTree.createFile("isa.investigation.xlsx");

package/dist/ts/ts/FileSystem/Path.d.ts

@@ -1,9 +1,31 @@
 import { FSharpList } from '@fable-org/fable-library-js/List.js';
+import { Option } from '@fable-org/fable-library-js/Option.js';
 export declare const seperators: string[];
 export declare const alternativeLICENSEFileNames: FSharpList<string>;
 export declare function split(path: string): string[];
+export declare function hasLeadingSeparator(path: string): boolean;
+export declare function isUncPath(path: string): boolean;
+export declare function tryGetDrivePrefix(path: string): Option<string>;
+export declare function splitWithPrefix(path: string): [Option<string>, string[]];
+export declare function normalizeRootPrefix(prefix: string): string;
+export declare function buildPathFromPrefixAndSegments(prefixOpt: Option<string>, segments: string[]): string;
 export declare function combine(path1: string, path2: string): string;
 export declare function combineMany(paths: string[]): string;
+/**
+ * Normalize path segments by removing "." and resolving ".." where possible.
+ */
+export declare function normalizeSegments(segments: string[]): string[];
+/**
+ * Normalize a path by resolving "." and ".." segments.
+ * Note: If normalization yields no segments, the trimmed original path is returned
+ * to preserve relative markers used by existing callers (e.g. "." or "./").
+ */
+export declare function normalize(path: string): string;
+export declare function normalizePathKey(path: string): string;
+/**
+ * Resolve a path (possibly relative) against the directory of a file path.
+ */
+export declare function resolvePathFromFile(filePath: string, path: string): string;
 export declare function getFileName(path: string): string;
 /**
  * Checks if `path` points to a file with the name `fileName`

package/dist/ts/ts/FileSystem/Path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/FileSystem/Path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAK1E,eAAO,MAAM,UAAU,EAAE,MAAM,EAAgB,CAAC;AAEhD,eAAO,MAAM,2BAA2B,EAAE,UAAU,CAAC,MAAM,CAAyD,CAAC;AAErH,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAU5C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAYnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAExE;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE9D"}
+{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/FileSystem/Path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAG1E,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAItE,eAAO,MAAM,UAAU,EAAE,MAAM,EAAgB,CAAC;AAEhD,eAAO,MAAM,2BAA2B,EAAE,UAAU,CAAC,MAAM,CAAyD,CAAC;AAErH,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAU5C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAYzD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAO9D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAiBxE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAwDpG;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAYnD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAoB9D;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgB9C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcrD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAuB1E;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAExE;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE9D"}

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

@@ -1,6 +1,8 @@
 import { ofArray } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { split as split$1, trimEnd, trimStart, join, trim } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { mapIndexed, last } from '../../node_modules/@fable-org/fable-library-js/Array.js';
+import { split as split$1, substring, join, trimEnd, trimStart, trim } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { isLetter } from '../../node_modules/@fable-org/fable-library-js/Char.js';
+import { value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { mapIndexed, item, append, last } from '../../node_modules/@fable-org/fable-library-js/Array.js';
 
 const seperators = ["/", "\\"];
 const alternativeLICENSEFileNames = ofArray(["LICENSE.txt", "LICENSE.md", "LICENSE.rst"]);
@@ -14,6 +16,107 @@ function split(path) {
     }
   });
 }
+function hasLeadingSeparator(path) {
+  if (path.length > 0) {
+    if (path[0] === "/") {
+      return true;
+    } else {
+      return path[0] === "\\";
+    }
+  } else {
+    return false;
+  }
+}
+function isUncPath(path) {
+  if (path.startsWith("//")) {
+    return true;
+  } else {
+    return path.startsWith("\\\\");
+  }
+}
+function tryGetDrivePrefix(path) {
+  if (path.length > 2 && isLetter(path[0]) && path[1] === ":" && (path[2] === "/" ? true : path[2] === "\\")) {
+    return substring(path, 0, 2);
+  } else {
+    return void 0;
+  }
+}
+function splitWithPrefix(path) {
+  const trimmed = path.trim();
+  const matchValue = tryGetDrivePrefix(trimmed);
+  if (matchValue == null) {
+    if (isUncPath(trimmed)) {
+      return ["//", split(trimmed)];
+    } else if (hasLeadingSeparator(trimmed)) {
+      return ["/", split(trimmed)];
+    } else {
+      return [void 0, split(trimmed)];
+    }
+  } else {
+    return [value(matchValue), split(substring(trimmed, 2))];
+  }
+}
+function normalizeRootPrefix(prefix) {
+  if (prefix === "//") {
+    return "//";
+  } else if (prefix.endsWith(":")) {
+    return `${prefix}/`;
+  } else {
+    return "/";
+  }
+}
+function buildPathFromPrefixAndSegments(prefixOpt, segments) {
+  let prefix_1, prefix_2;
+  if (segments.length === 0) {
+    if (prefixOpt == null) {
+      return "";
+    } else {
+      return normalizeRootPrefix(value(prefixOpt));
+    }
+  } else {
+    const combined = join("/", segments);
+    let matchResult, prefix_3, prefix_4;
+    if (prefixOpt == null) {
+      matchResult = 4;
+    } else {
+      switch (value(prefixOpt)) {
+        case "//": {
+          matchResult = 0;
+          break;
+        }
+        case "/": {
+          if (prefix_1 = value(prefixOpt), prefix_1.endsWith(":")) {
+            matchResult = 1;
+            prefix_3 = value(prefixOpt);
+          } else {
+            matchResult = 2;
+          }
+          break;
+        }
+        default:
+          if (prefix_2 = value(prefixOpt), prefix_2.endsWith(":")) {
+            matchResult = 1;
+            prefix_3 = value(prefixOpt);
+          } else {
+            matchResult = 3;
+            prefix_4 = value(prefixOpt);
+          }
+      }
+    }
+    switch (matchResult) {
+      case 0:
+        return `//${combined}`;
+      case 1:
+        return `${prefix_3}/${combined}`;
+      case 2:
+        return `/${combined}`;
+      case 3:
+        return `${prefix_4}/${combined}`;
+      default:
+        return combined;
+    }
+  }
+}
 function combine(path1, path2) {
   return trimEnd(path1, ...seperators) + "/" + trimStart(path2, ...seperators);
 }
@@ -28,6 +131,73 @@ function combineMany(paths) {
     }
   }, paths));
 }
+function normalizeSegments(segments) {
+  const resolved = [];
+  for (let idx = 0; idx <= segments.length - 1; idx++) {
+    const rawSegment = item(idx, segments);
+    const segment = rawSegment.trim();
+    if (segment === "" ? true : segment === ".") {
+    } else if (segment === "..") {
+      if (resolved.length > 0 && resolved[resolved.length - 1] !== "..") {
+        resolved.splice(resolved.length - 1, 1);
+      } else {
+        void resolved.push(segment);
+      }
+    } else {
+      void resolved.push(segment);
+    }
+  }
+  return resolved.slice();
+}
+function normalize(path) {
+  const trimmedPath = path.trim();
+  const patternInput = splitWithPrefix(trimmedPath);
+  const prefixOpt = patternInput[0];
+  const normalizedSegments = normalizeSegments(patternInput[1]);
+  if (normalizedSegments.length === 0) {
+    if (prefixOpt == null) {
+      return trimmedPath;
+    } else {
+      return normalizeRootPrefix(value(prefixOpt));
+    }
+  } else {
+    return buildPathFromPrefixAndSegments(prefixOpt, normalizedSegments);
+  }
+}
+function normalizePathKey(path) {
+  const normalized = normalize(path);
+  if (normalized === "") {
+    return path.trim();
+  } else {
+    const trimmedLeadingSeparators = trimStart(normalized, ...seperators);
+    if (trimmedLeadingSeparators === "") {
+      return normalized;
+    } else {
+      return trimmedLeadingSeparators;
+    }
+  }
+}
+function resolvePathFromFile(filePath, path) {
+  const trimmedPath = path.trim();
+  const patternInput = splitWithPrefix(trimmedPath);
+  if (patternInput[0] != null) {
+    return normalize(trimmedPath);
+  } else {
+    const patternInput_1 = splitWithPrefix(filePath);
+    const filePrefixOpt = patternInput_1[0];
+    const filePathSegments = patternInput_1[1];
+    const resolvedSegments = normalizeSegments(append(filePathSegments.length <= 1 ? [] : filePathSegments.slice(0, filePathSegments.length - 2 + 1), patternInput[1]));
+    if (resolvedSegments.length === 0) {
+      if (filePrefixOpt == null) {
+        return trimmedPath;
+      } else {
+        return normalizeRootPrefix(value(filePrefixOpt));
+      }
+    } else {
+      return buildPathFromPrefixAndSegments(filePrefixOpt, resolvedSegments);
+    }
+  }
+}
 function getFileName(path) {
   return last(split(path));
 }
@@ -47,4 +217,4 @@ function getRunFolderPath(runIdentifier) {
   return combine("runs", runIdentifier);
 }
 
-export { alternativeLICENSEFileNames, combine, combineMany, getAssayFolderPath, getFileName, getRunFolderPath, getStudyFolderPath, getWorkflowFolderPath, isFile, seperators, split };
+export { alternativeLICENSEFileNames, buildPathFromPrefixAndSegments, combine, combineMany, getAssayFolderPath, getFileName, getRunFolderPath, getStudyFolderPath, getWorkflowFolderPath, hasLeadingSeparator, isFile, isUncPath, normalize, normalizePathKey, normalizeRootPrefix, normalizeSegments, resolvePathFromFile, seperators, split, splitWithPrefix, tryGetDrivePrefix };

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

@@ -2,7 +2,7 @@ import { choose, ofArray, singleton, empty } from '../../node_modules/@fable-org
 import { map, unwrap, defaultArg, value, bind } from '../../node_modules/@fable-org/fable-library-js/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';
+import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './Datamap/Datamap.js';
 import { encoder as encoder$2, decoder as decoder$1, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
 import { encoder as encoder$3, decoder as decoder$3, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$2 } from './Person.js';
 import { encoder as encoder$4, decoder as decoder$4, ROCrate_encoder as ROCrate_encoder$4, ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$2 } from './Comment.js';
@@ -38,7 +38,7 @@ function encoder(assay) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryInclude("DataMap", encoder$1, assay.DataMap), tryIncludeSeq("Tables", encoder$2, assay.Tables), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
+  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryInclude("Datamap", encoder$1, assay.Datamap), tryIncludeSeq("Tables", encoder$2, assay.Tables), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
   return {
     Encode(helpers_3) {
       const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
@@ -48,7 +48,7 @@ function encoder(assay) {
 }
 const decoder = object((get$) => {
   let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9;
-  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))));
+  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;
@@ -64,7 +64,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, assay) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), assay.Tables), tryInclude("DataMap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), assay.DataMap), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
+  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), assay.Tables), tryInclude("Datamap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), assay.Datamap), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
   return {
     Encode(helpers_3) {
       const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
@@ -75,7 +75,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, assay) {
 function decoderCompressed(stringTable, oaTable, cellTable) {
   return object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9;
-    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(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((arg_15 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_7 = get$.Optional, objectArg_7.Field("DataMap", arg_15))), 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))));
+    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(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((arg_15 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_7 = get$.Optional, objectArg_7.Field("Datamap", arg_15))), 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 ROCrate_genID(a) {

package/dist/ts/ts/Json/{DataMap → Datamap}/DataContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/DataMap/DataContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAKjH,OAAO,EAA+B,WAAW,EAAwK,MAAM,2BAA2B,CAAC;AAK3P,wBAAgB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,UAAU,CAoBnD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,WAAW,CAMzC,CAAC"}
+{"version":3,"file":"DataContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Datamap/DataContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAKjH,OAAO,EAA+B,WAAW,EAAwK,MAAM,2BAA2B,CAAC;AAK3P,wBAAgB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,UAAU,CAoBnD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,WAAW,CAMzC,CAAC"}

package/dist/ts/ts/Json/{DataMap/DataMap.d.ts → Datamap/Datamap.d.ts}

@@ -1,11 +1,11 @@
 import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { DataMap } from '../../Core/DataMap.js';
+import { Datamap } from '../../Core/Datamap.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';
-export declare function encoder(dm: DataMap): IEncodable;
-export declare const decoder: Decoder$1<DataMap>;
-export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, dm: DataMap): IEncodable;
-export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<DataMap>;
-//# sourceMappingURL=DataMap.d.ts.map
+export declare function encoder(dm: Datamap): IEncodable;
+export declare const decoder: Decoder$1<Datamap>;
+export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, dm: Datamap): IEncodable;
+export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<Datamap>;
+//# sourceMappingURL=Datamap.d.ts.map

package/dist/ts/ts/Json/{DataMap/DataMap.d.ts.map → Datamap/Datamap.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"DataMap.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/DataMap/DataMap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,wBAAgB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,UAAU,CAQ/C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,OAAO,CAGrC,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,EAAE,EAAE,OAAO,GAAG,UAAU,CAEnL;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAE7I"}
+{"version":3,"file":"Datamap.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Datamap/Datamap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,wBAAgB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,UAAU,CAQ/C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,OAAO,CAGrC,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,EAAE,EAAE,OAAO,GAAG,UAAU,CAEnL;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAE7I"}

package/dist/ts/ts/Json/{DataMap/DataMap.js → Datamap/Datamap.js}

@@ -1,7 +1,7 @@
 import { seq } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { map } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encoder as encoder$1, decoder as decoder$1 } from './DataContext.js';
-import { DataMap } from '../../Core/DataMap.js';
+import { Datamap } from '../../Core/Datamap.js';
 import { object, resizeArray } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 
 function encoder(dm) {
@@ -15,7 +15,7 @@ function encoder(dm) {
 }
 const decoder = object((get$) => {
   let arg_1, objectArg;
-  return new DataMap((arg_1 = resizeArray(decoder$1), objectArg = get$.Required, objectArg.Field("dataContexts", arg_1)));
+  return new Datamap((arg_1 = resizeArray(decoder$1), objectArg = get$.Required, objectArg.Field("dataContexts", arg_1)));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, dm) {
   return encoder(dm);

package/dist/ts/ts/Json/ROCrate/LDContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LDContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkH,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAC9M,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAWvD,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,SAAS,CA4CxC,CAAC;AAEF,wBAAgB,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAgEtD"}
+{"version":3,"file":"LDContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkH,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAC9M,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAWvD,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,SAAS,CA4CxC,CAAC;AAEF,wBAAgB,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CA0EtD"}

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

@@ -4,7 +4,7 @@ import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, resizeArray }
 import { getEnumerator, disposeSafe } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
 import { isEmpty, length, head } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
-import { initV1_2DRAFT, initV1_1 } from '../../ROCrate/ROCrateContext.js';
+import { initV1_2, initV1_1 } from '../../ROCrate/ROCrateContext.js';
 import { value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { map, append, toList, delay, singleton, empty } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { seq } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
@@ -40,7 +40,7 @@ const decoder = {
       }
     } else if (helpers.isString(value)) {
       const s = helpers.asString(value);
-      return s === "https://w3id.org/ro/crate/1.2-DRAFT/context" ? FSharpResult$2_Ok(initV1_2DRAFT()) : s === "https://w3id.org/ro/crate/1.1/context" ? FSharpResult$2_Ok(initV1_1()) : FSharpResult$2_Error(["", ErrorReason$1_BadPrimitive("an object", value)]);
+      return (s === "https://w3id.org/ro/crate/1.2-DRAFT/context" ? true : s === "https://w3id.org/ro/crate/1.2/context") ? FSharpResult$2_Ok(initV1_2()) : s === "https://w3id.org/ro/crate/1.1/context" ? FSharpResult$2_Ok(initV1_1()) : FSharpResult$2_Error(["", ErrorReason$1_BadPrimitive("an object", value)]);
     } else if (helpers.isArray(value)) {
       const matchValue_1 = resizeArray(this$).Decode(helpers, value);
       return matchValue_1.tag === /* Error */
@@ -63,15 +63,19 @@ function encoder(ctx_mut) {
             matchResult = 0;
             break;
           }
-          case "https://w3id.org/ro/crate/1.1/context": {
+          case "https://w3id.org/ro/crate/1.2/context": {
             matchResult = 1;
             break;
           }
-          default:
+          case "https://w3id.org/ro/crate/1.1/context": {
             matchResult = 2;
+            break;
+          }
+          default:
+            matchResult = 3;
         }
       } else {
-        matchResult = 2;
+        matchResult = 3;
       }
       switch (matchResult) {
         case 0:
@@ -83,20 +87,26 @@ function encoder(ctx_mut) {
         case 1:
           return {
             Encode(helpers_1) {
-              return helpers_1.encodeString("https://w3id.org/ro/crate/1.1/context");
+              return helpers_1.encodeString("https://w3id.org/ro/crate/1.2/context");
+            }
+          };
+        case 2:
+          return {
+            Encode(helpers_2) {
+              return helpers_2.encodeString("https://w3id.org/ro/crate/1.1/context");
             }
           };
         default: {
           let mappings;
           const values = map((kv) => [kv[0], {
-            Encode(helpers_2) {
-              return helpers_2.encodeString(kv[1]);
+            Encode(helpers_3) {
+              return helpers_3.encodeString(kv[1]);
             }
           }], ctx.Mappings);
           mappings = {
-            Encode(helpers_3) {
-              const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values);
-              return helpers_3.encodeObject(arg);
+            Encode(helpers_4) {
+              const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_4)], values);
+              return helpers_4.encodeObject(arg);
             }
           };
           if (ctx.BaseContexts.length === 0) {

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

@@ -2,6 +2,7 @@ import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0
 import { LDNode } from '../../ROCrate/LDObject.js';
 export declare function genericEncoder(obj: any): IEncodable;
 export declare function encoder(obj: LDNode): IEncodable;
+export declare const nullDecoder: Decoder$1<void>;
 /**
  * Returns a decoder
  *

package/dist/ts/ts/Json/ROCrate/LDNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LDNode.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+F,SAAS,EAAE,UAAU,EAAqB,MAAM,uDAAuD,CAAC;AAG9M,OAAO,EAAE,MAAM,EAAkB,MAAM,2BAA2B,CAAC;AAgBnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CA+DnD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CA6B/C;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CA0FhE;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,MAAM,CAAuE,CAAC;AAE9G,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,GAAG,CAAqB,CAAC"}
+{"version":3,"file":"LDNode.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,EAAuE,UAAU,EAAqB,MAAM,uDAAuD,CAAC;AAG9M,OAAO,EAAE,MAAM,EAAkB,MAAM,2BAA2B,CAAC;AAgBnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CA+DnD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CA6B/C;AAED,eAAO,MAAM,WAAW,EAAE,SAAS,CAAC,IAAI,CAIvC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAgGhE;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,MAAM,CAAuE,CAAC;AAE9G,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,GAAG,CAAqB,CAAC"}

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

@@ -1,4 +1,4 @@
-import { ErrorReason$1_BadOneOf, ErrorReason$1_BadPrimitive } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
+import { ErrorReason$1_BadPrimitive, ErrorReason$1_BadOneOf } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
 import { dateTime, resizeArrayOrSingleton } from '../Encode.js';
 import { LDValue, LDRef, LDNode } from '../../ROCrate/LDObject.js';
 import { encoder as encoder$1, decoder as decoder$2 } from './LDValue.js';
@@ -8,10 +8,10 @@ import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { toList, delay, map, enumerateFromFunctions, append, singleton, empty, collect } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encoder as encoder$3, decoder as decoder$1 } from './LDContext.js';
 import { value, unwrap } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, map as map$1, oneOf, int, decimal } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { FSharpResult$2_Ok, FSharpResult$2_Error } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
+import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, map as map$1, oneOf, int, decimal, bool } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { Decode_resizeArrayOrSingleton, Helpers_prependPath } from '../Decode.js';
 import { isEmpty, length, head, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
 import { fold } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
 
 function genericEncoder(obj) {
@@ -98,11 +98,16 @@ function encoder(obj) {
     }
   };
 }
+const nullDecoder = {
+  Decode(helpers, value) {
+    return helpers.isNullValue(value) ? FSharpResult$2_Ok(void 0) : FSharpResult$2_Error(["", ErrorReason$1_BadPrimitive("null", value)]);
+  }
+};
 function getDecoder(expectObject) {
   const decode = (expectObject_1) => {
     const decodeObject = {
       Decode(helpers, value$1) {
-        let arg_7, objectArg_3, arg_9, objectArg_4;
+        let arg_7, objectArg_3;
         if (helpers.isObject(value$1)) {
           const getters = Getters$2_$ctor_Z4BE6C149(helpers, value$1);
           const properties = helpers.getProperties(value$1);
@@ -124,7 +129,13 @@ function getDecoder(expectObject) {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
               const property = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
               if (property !== "@id" && property !== "@type" && property !== "@context") {
-                o.SetProperty(property, (arg_9 = decode(false), objectArg_4 = get$.Required, objectArg_4.Field(property, arg_9)));
+                let r;
+                const arg_9 = decode(false);
+                const objectArg_4 = get$.Required;
+                r = objectArg_4.Field(property, arg_9);
+                if (!equals(r, defaultOf())) {
+                  o.SetProperty(property, r);
+                }
               }
             }
           } finally {
@@ -179,7 +190,7 @@ function getDecoder(expectObject) {
     if (expectObject_1) {
       return map$1((value_4) => value_4, decodeObject);
     } else {
-      return oneOf(ofArray([map$1((value_5) => value_5, decoder$2), map$1((value_6) => value_6, decodeObject), map$1((value_7) => value_7, decoder$3), map$1((value_8) => value_8, resizeArray), map$1((value_9) => value_9, string), map$1((value_10) => value_10, int), map$1((value_11) => value_11, decimal)]));
+      return oneOf(ofArray([map$1((value_5) => value_5, decoder$2), map$1((value_6) => value_6, decodeObject), map$1((value_7) => value_7, decoder$3), map$1((value_8) => value_8, resizeArray), map$1((value_9) => value_9, string), map$1((value_10) => value_10, int), map$1((value_11) => value_11, decimal), map$1((value_12) => value_12, bool), map$1(() => void 0, nullDecoder)]));
     }
   };
   return decode(expectObject);
@@ -187,4 +198,4 @@ function getDecoder(expectObject) {
 const decoder = map$1((value) => value, getDecoder(true));
 const genericDecoder = getDecoder(false);
 
-export { decoder, encoder, genericDecoder, genericEncoder, getDecoder };
+export { decoder, encoder, genericDecoder, genericEncoder, getDecoder, nullDecoder };