@nfdi4plants/arctrl 3.1.1 → 3.2.0

package/dist/ts/ts/Conversion/Basic.js

@@ -1,5 +1,6 @@
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
-import { value, unwrap, map, defaultArg, bind } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
+import { value, unwrap, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { LDComment } from '../ROCrate/LDTypes/Comment.js';
 import { Comment$ } from '../Core/Comment.js';
 import { LDRef, LDNode } from '../ROCrate/LDObject.js';
@@ -9,17 +10,17 @@ import { LDDefinedTerm } from '../ROCrate/LDTypes/DefinedTerm.js';
 import { LDPropertyValue } from '../ROCrate/LDTypes/PropertyValue.js';
 import { Data } from '../Core/Data.js';
 import { CompositeCell_Term, CompositeCell_Unitized, CompositeCell_FreeText, CompositeCell_Data } from '../Core/Table/CompositeCell.js';
-import { toFail, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { CompositeHeader_Component, CompositeHeader_Parameter, CompositeHeader_Factor, CompositeHeader_Characteristic, CompositeHeader_Input, IOType_Source, IOType_Material, IOType_Sample, IOType_Data, IOType_FreeText, CompositeHeader_Output } from '../Core/Table/CompositeHeader.js';
+import { toFail, printf, concat } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { CompositeHeader_Component, CompositeHeader_Parameter, CompositeHeader_Factor, CompositeHeader_Characteristic, CompositeHeader_Input, IOType, IOType_FreeText, CompositeHeader_Output } from '../Core/Table/CompositeHeader.js';
 import { DataFile__get_AsString, DataFile_fromString_Z721C83C5 } from '../Core/DataFile.js';
 import { LDFile } from '../ROCrate/LDTypes/File.js';
 import { LDDataset } from '../ROCrate/LDTypes/Dataset.js';
-import { map as map$1 } from '../../node_modules/@fable-org/fable-library-js/Array.js';
+import { map, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { combine } from '../FileSystem/Path.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-js/Types.js';
+import { toString } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
 import { DataContext } from '../Core/DataContext.js';
 import { LDSample } from '../ROCrate/LDTypes/Sample.js';
-import { Value_Name, Value_Ontology } from '../Core/Value.js';
+import { ScalarValue_Name, ScalarValue_Ontology } from '../Core/ScalarValue.js';
 import { ActivePatterns_$007CRegex$007C_$007C } from '../Core/Helper/Regex.js';
 
 class BaseTypes {
@@ -33,7 +34,7 @@ function BaseTypes_composeComment_Z13201A7E(comment) {
   let name;
   const matchValue = comment.Name;
   if (matchValue == null) {
-    throw new Error("Comment must have a name");
+    throw new Exception("Comment must have a name");
   } else {
     name = value(matchValue);
   }
@@ -72,7 +73,7 @@ function BaseTypes_decomposePropertyValueToOA_Z2F770004(term, context) {
   return BaseTypes_ontologyTermFromNameAndID_40457300(LDPropertyValue.getNameAsString(term, unwrap(context)), unwrap(LDPropertyValue.tryGetPropertyIDAsString(term, unwrap(context))));
 }
 function BaseTypes_valuesOfCell_Z436420FE(value) {
-  let term, term_1;
+  let term = void 0, term_1 = void 0;
   switch (value.tag) {
     case /* Term */
     0:
@@ -96,7 +97,7 @@ function BaseTypes_valuesOfCell_Z436420FE(value) {
     case /* Data */
     3: {
       const data = value.fields[0];
-      throw new Error("Data cell should not be parsed to isa value");
+      throw new Exception("Data cell should not be parsed to isa value");
     }
     default:
       if (value.fields[0] === "") {
@@ -108,7 +109,7 @@ function BaseTypes_valuesOfCell_Z436420FE(value) {
   }
 }
 function BaseTypes_termOfHeader_6CAF647B(header) {
-  let matchResult, oa;
+  let matchResult = void 0, oa = void 0;
   switch (header.tag) {
     case /* Component */
     0: {
@@ -165,11 +166,13 @@ function BaseTypes_composeCharacteristicValue(header, value) {
   return LDPropertyValue.createCharacteristicValue(patternInput_1[0], unwrap(patternInput[0]), void 0, unwrap(patternInput_1[1]), unwrap(patternInput[3]), unwrap(patternInput[2]), unwrap(patternInput[1]));
 }
 function BaseTypes_composeFreetextMaterialName(headerFT, name) {
-  return `${headerFT}=${name}`;
+  return concat(headerFT, "=", name);
 }
 function BaseTypes_composeFile_6CE21C7D(d, fs) {
   const createFile = () => {
-    const dataType = map(DataFile__get_AsString, d.DataType);
+    let dataType;
+    const option_1 = d.DataType;
+    dataType = option_1 != null ? DataFile__get_AsString(value(option_1)) : void 0;
     return LDFile.create(d.NameText, d.NameText, void 0, unwrap(dataType), unwrap(d.Format), unwrap(d.SelectorFormat));
   };
   if (fs == null) {
@@ -184,7 +187,7 @@ function BaseTypes_composeFile_6CE21C7D(d, fs) {
         const file = createFile();
         file.SchemaType = [LDFile.schemaType, LDDataset.schemaType];
         let subFiles;
-        const collection = map$1((fp) => {
+        const collection = map((fp) => {
           const fullPath = combine(d.NameText, fp);
           return LDFile.create(fullPath, fullPath);
         }, fs_2.ToFilePaths(true));
@@ -200,21 +203,26 @@ function BaseTypes_composeFile_6CE21C7D(d, fs) {
   }
 }
 function BaseTypes_decomposeFile_Z2F770004(f, context) {
-  const dataType = map(DataFile_fromString_Z721C83C5, LDFile.tryGetDisambiguatingDescriptionAsString(f, unwrap(context)));
+  let dataType;
+  const option_1 = LDFile.tryGetDisambiguatingDescriptionAsString(f, unwrap(context));
+  dataType = option_1 != null ? DataFile_fromString_Z721C83C5(value(option_1)) : void 0;
   const format = LDFile.tryGetEncodingFormatAsString(f, unwrap(context));
   const selectorFormat = LDFile.tryGetUsageInfoAsString(f, unwrap(context));
   return new Data(void 0, LDFile.getNameAsString(f, unwrap(context)), unwrap(dataType), unwrap(format), unwrap(selectorFormat));
 }
 function BaseTypes_composeFragmentDescriptor_Z4C0BEF62(dc) {
+  let option_1 = void 0, e = void 0, option_4 = void 0, u = void 0;
   if (dc.Name == null) {
-    throw new Error("RO-Crate parsing of DataContext failed: Cannot create a fragment descriptor without a name.");
+    throw new Exception("RO-Crate parsing of DataContext failed: Cannot create a fragment descriptor without a name.");
   }
   const id = LDPropertyValue.genIdFragmentDescriptor(dc.NameText);
-  const patternInput = defaultArg(map((e) => [e.Name, Option_fromValueWithDefault("", e.TermAccessionAndOntobeeUrlIfShort)], dc.Explication), [void 0, void 0]);
-  const patternInput_1 = defaultArg(map((u) => [u.Name, Option_fromValueWithDefault("", u.TermAccessionAndOntobeeUrlIfShort)], dc.Unit), [void 0, void 0]);
+  const patternInput = defaultArg((option_1 = dc.Explication, option_1 != null ? (e = value(option_1), [e.Name, Option_fromValueWithDefault("", e.TermAccessionAndOntobeeUrlIfShort)]) : void 0), [void 0, void 0]);
+  const patternInput_1 = defaultArg((option_4 = dc.Unit, option_4 != null ? (u = value(option_4), [u.Name, Option_fromValueWithDefault("", u.TermAccessionAndOntobeeUrlIfShort)]) : void 0), [void 0, void 0]);
   const disambiguatingDescriptions = Option_fromSeq(ResizeArray_map(toString, dc.Comments));
   const dataFragment = BaseTypes_composeFile_6CE21C7D(dc);
-  const pattern = map(BaseTypes_composeDefinedTerm_ZDED3A0F, dc.ObjectType);
+  let pattern;
+  const option_7 = dc.ObjectType;
+  pattern = option_7 != null ? BaseTypes_composeDefinedTerm_ZDED3A0F(value(option_7)) : void 0;
   dataFragment.SetProperty(LDFile.about, new LDRef(id));
   dataFragment.SetOptionalProperty(LDFile.pattern, pattern);
   return LDPropertyValue.createFragmentDescriptor(dc.NameText, unwrap(patternInput[0]), void 0, unwrap(patternInput_1[1]), unwrap(patternInput_1[0]), unwrap(patternInput[1]), unwrap(dc.GeneratedBy), unwrap(dc.Description), unwrap(dc.Label), unwrap(disambiguatingDescriptions), dataFragment);
@@ -223,14 +231,37 @@ function BaseTypes_decomposeFragmentDescriptor_Z6839B9E8(fd, graph, context) {
   const file = LDPropertyValue.tryGetSubjectOf(fd, unwrap(graph), unwrap(context));
   let name;
   if (file == null) {
-    throw new Error("RO-Crate parsing of DataContext failed: Cannot decompose a fragment descriptor without a name.");
+    throw new Exception("RO-Crate parsing of DataContext failed: Cannot decompose a fragment descriptor without a name.");
   } else {
     const f = value(file);
     name = LDFile.getNameAsString(f, unwrap(context));
   }
-  const objectType = map((pa) => BaseTypes_decomposeDefinedTerm_Z2F770004(pa, unwrap(context)), bind((f_1) => LDFile.tryGetPatternAsDefinedTerm(f_1, unwrap(graph), unwrap(context)), file));
-  const format = bind((f_2) => LDFile.tryGetEncodingFormatAsString(f_2, unwrap(context)), file);
-  const selectorFormat = bind((f_3) => LDFile.tryGetUsageInfoAsString(f_3, unwrap(context)), file);
+  let objectType;
+  let option_3;
+  const option_1 = file;
+  if (option_1 != null) {
+    const f_1 = value(option_1);
+    option_3 = LDFile.tryGetPatternAsDefinedTerm(f_1, unwrap(graph), unwrap(context));
+  } else {
+    option_3 = void 0;
+  }
+  objectType = option_3 != null ? BaseTypes_decomposeDefinedTerm_Z2F770004(value(option_3), unwrap(context)) : void 0;
+  let format;
+  const option_5 = file;
+  if (option_5 != null) {
+    const f_2 = value(option_5);
+    format = LDFile.tryGetEncodingFormatAsString(f_2, unwrap(context));
+  } else {
+    format = void 0;
+  }
+  let selectorFormat;
+  const option_7 = file;
+  if (option_7 != null) {
+    const f_3 = value(option_7);
+    selectorFormat = LDFile.tryGetUsageInfoAsString(f_3, unwrap(context));
+  } else {
+    selectorFormat = void 0;
+  }
   const explication = BaseTypes_tryOntologyTermFromNameAndID_40457300(unwrap(LDPropertyValue.tryGetValueAsString(fd)), unwrap(LDPropertyValue.tryGetValueReferenceAsString(fd)));
   const unit = BaseTypes_tryOntologyTermFromNameAndID_40457300(unwrap(LDPropertyValue.tryGetUnitTextAsString(fd)), unwrap(LDPropertyValue.tryGetUnitCodeAsString(fd)));
   const generatedBy = LDPropertyValue.tryGetMeasurementMethodAsString(fd);
@@ -276,7 +307,7 @@ function BaseTypes_composeProcessInput(header, value, fs) {
   }
 }
 function BaseTypes_composeProcessOutput(header, value, fs) {
-  let matchResult, ft_1;
+  let matchResult = void 0, ft_1 = void 0;
   if (header.tag === /* Output */
   12) {
     switch (header.fields[0].tag) {
@@ -344,7 +375,7 @@ function BaseTypes_cellOfPropertyValue_Z2F770004(pv, context) {
   const vRef = LDPropertyValue.tryGetValueReferenceAsString(pv, unwrap(context));
   const u = LDPropertyValue.tryGetUnitTextAsString(pv, unwrap(context));
   const uRef = LDPropertyValue.tryGetUnitCodeAsString(pv, unwrap(context));
-  let matchResult, vr, u_1, uRef_1;
+  let matchResult = void 0, vr = void 0, u_1 = void 0, uRef_1 = void 0;
   if (vRef == null) {
     if (u == null) {
       if (uRef == null) {
@@ -386,8 +417,8 @@ function BaseTypes_cellOfPropertyValue_Z2F770004(pv, context) {
   }
 }
 function BaseTypes_decomposePropertyValue_Z2F770004(pv, context) {
-  let v, vRef, vr, u, uRef, uRef_1, u_1;
-  return [BaseTypes_headerOntologyOfPropertyValue_Z2F770004(pv, unwrap(context)), (v = LDPropertyValue.tryGetValueAsString(pv, unwrap(context)), vRef = LDPropertyValue.tryGetValueReferenceAsString(pv, unwrap(context)), vRef == null ? v == null ? void 0 : Value_Name(value(v)) : (vr = value(vRef), Value_Ontology(OntologyAnnotation.fromTermAnnotation(vr, unwrap(v))))), (u = LDPropertyValue.tryGetUnitTextAsString(pv, unwrap(context)), uRef = LDPropertyValue.tryGetUnitCodeAsString(pv, unwrap(context)), u == null ? uRef == null ? void 0 : (uRef_1 = value(uRef), OntologyAnnotation.fromTermAnnotation(uRef_1, unwrap(u))) : uRef != null ? (uRef_1 = value(uRef), OntologyAnnotation.fromTermAnnotation(uRef_1, unwrap(u))) : (u_1 = value(u), new OntologyAnnotation(u_1)))];
+  let v = void 0, vRef = void 0, vr = void 0, u = void 0, uRef = void 0, uRef_1 = void 0, u_1 = void 0;
+  return [BaseTypes_headerOntologyOfPropertyValue_Z2F770004(pv, unwrap(context)), (v = LDPropertyValue.tryGetValueAsString(pv, unwrap(context)), vRef = LDPropertyValue.tryGetValueReferenceAsString(pv, unwrap(context)), vRef == null ? v == null ? void 0 : ScalarValue_Name(value(v)) : (vr = value(vRef), ScalarValue_Ontology(OntologyAnnotation.fromTermAnnotation(vr, unwrap(v))))), (u = LDPropertyValue.tryGetUnitTextAsString(pv, unwrap(context)), uRef = LDPropertyValue.tryGetUnitCodeAsString(pv, unwrap(context)), u == null ? uRef == null ? void 0 : (uRef_1 = value(uRef), OntologyAnnotation.fromTermAnnotation(uRef_1, unwrap(u))) : uRef != null ? (uRef_1 = value(uRef), OntologyAnnotation.fromTermAnnotation(uRef_1, unwrap(u))) : (u_1 = value(u), new OntologyAnnotation(u_1)))];
 }
 function BaseTypes_decomposeComponent_Z2F770004(c, context) {
   return [CompositeHeader_Component(BaseTypes_headerOntologyOfPropertyValue_Z2F770004(c, unwrap(context))), BaseTypes_cellOfPropertyValue_Z2F770004(c, unwrap(context))];
@@ -403,36 +434,36 @@ function BaseTypes_decomposeCharacteristicValue_Z2F770004(c, context) {
 }
 function BaseTypes_decomposeProcessInput_Z2F770004(pn, context) {
   if (LDSample.validateSource(pn, unwrap(context))) {
-    return [CompositeHeader_Input(IOType_Source()), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
+    return [CompositeHeader_Input(IOType.Source), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
   } else if (LDSample.validateMaterial(pn, unwrap(context))) {
-    return [CompositeHeader_Input(IOType_Material()), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
+    return [CompositeHeader_Input(IOType.Material), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
   } else if (LDSample.validate(pn, unwrap(context))) {
-    return [CompositeHeader_Input(IOType_Sample()), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
+    return [CompositeHeader_Input(IOType.Sample), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
   } else if (LDFile.validate(pn, unwrap(context))) {
-    return [CompositeHeader_Input(IOType_Data()), CompositeCell_Data(BaseTypes_decomposeFile_Z2F770004(pn, unwrap(context)))];
+    return [CompositeHeader_Input(IOType.Data), CompositeCell_Data(BaseTypes_decomposeFile_Z2F770004(pn, unwrap(context)))];
   } else {
     const n = pn;
-    return [CompositeHeader_Input(IOType_FreeText(n.SchemaType[0])), CompositeCell_FreeText(LDSample.getNameAsString(n, unwrap(context)))];
+    return [CompositeHeader_Input(IOType_FreeText(item(0, n.SchemaType))), CompositeCell_FreeText(LDSample.getNameAsString(n, unwrap(context)))];
   }
 }
 function BaseTypes_decomposeProcessOutput_Z2F770004(pn, context) {
   if (LDSample.validateMaterial(pn, unwrap(context))) {
-    return [CompositeHeader_Output(IOType_Material()), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
+    return [CompositeHeader_Output(IOType.Material), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
   } else if (LDSample.validate(pn, unwrap(context))) {
-    return [CompositeHeader_Output(IOType_Sample()), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
+    return [CompositeHeader_Output(IOType.Sample), CompositeCell_FreeText(LDSample.getNameAsString(pn, unwrap(context)))];
   } else if (LDFile.validate(pn, unwrap(context))) {
-    return [CompositeHeader_Output(IOType_Data()), CompositeCell_Data(BaseTypes_decomposeFile_Z2F770004(pn, unwrap(context)))];
+    return [CompositeHeader_Output(IOType.Data), CompositeCell_Data(BaseTypes_decomposeFile_Z2F770004(pn, unwrap(context)))];
   } else {
     const n = pn;
-    return [CompositeHeader_Output(IOType_FreeText(n.SchemaType[0])), CompositeCell_FreeText(LDSample.getNameAsString(n, unwrap(context)))];
+    return [CompositeHeader_Output(IOType_FreeText(item(0, n.SchemaType))), CompositeCell_FreeText(LDSample.getNameAsString(n, unwrap(context)))];
   }
 }
 function BaseTypes_composeTechnologyPlatform_ZDED3A0F(tp) {
   const matchValue = tp.TANInfo;
   if (matchValue == null) {
-    return `${tp.NameText}`;
+    return tp.NameText;
   } else {
-    return `${tp.NameText} (${tp.TermAccessionShort})`;
+    return concat(tp.NameText, " (", tp.TermAccessionShort, ")");
   }
 }
 function BaseTypes_decomposeTechnologyPlatform_Z721C83C5(name) {

package/dist/ts/ts/Conversion/ColumnIndex.d.ts

@@ -1,6 +1,6 @@
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { LDNode } from '../ROCrate/LDObject.js';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { LDNode } from '../ROCrate/LDObject.ts';
 export declare const orderName = "columnIndex";
 export declare const columndIndexProperty = "https://w3id.org/ro/terms/arc#columnIndex";
 export declare function tryGetIndex(node: LDNode): Option<int32>;

package/dist/ts/ts/Conversion/ColumnIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnIndex.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/ColumnIndex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAEvE,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAiBhD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AAEvC,eAAO,MAAM,oBAAoB,8CAA8C,CAAC;AAEhF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAyCvD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAEzD;AAED,wBAAgB,4CAA4C,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAEjF;AAED,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAE5F;AAED,wBAAgB,sDAAsD,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAExG"}
+{"version":3,"file":"ColumnIndex.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/ColumnIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAEvE,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAiBhD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AAEvC,eAAO,MAAM,oBAAoB,8CAA8C,CAAC;AAEhF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAyCvD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAEzD;AAED,wBAAgB,4CAA4C,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAEjF;AAED,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAE5F;AAED,wBAAgB,sDAAsD,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAExG"}

package/dist/ts/ts/Conversion/ColumnIndex.js

@@ -1,12 +1,12 @@
-import { tryParse } from '../../node_modules/@fable-org/fable-library-js/Int32.js';
-import { FSharpRef } from '../../node_modules/@fable-org/fable-library-js/Types.js';
-import { value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { int32ToString } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { tryParse } from '../../node_modules/@fable-org/fable-library-ts/Int32.js';
+import { FSharpRef } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { int32ToString } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 
 function tryInt(str) {
   let matchValue;
   let outArg = 0;
-  matchValue = [tryParse(str, 511, false, 32, new FSharpRef(() => outArg, (v) => {
+  matchValue = [tryParse(str, 511, false, 32, new FSharpRef(() => outArg | 0, (v) => {
     outArg = v | 0;
   })), outArg];
   if (matchValue[0]) {
@@ -19,7 +19,7 @@ const orderName = "columnIndex";
 const columndIndexProperty = "https://w3id.org/ro/terms/arc#columnIndex";
 function tryGetIndex(node) {
   const matchValue = node.TryGetPropertyAsSingleton(columndIndexProperty);
-  let matchResult, ci;
+  let matchResult = void 0, ci = void 0;
   if (matchValue != null) {
     if (typeof value(matchValue) === "string") {
       matchResult = 0;
@@ -35,7 +35,7 @@ function tryGetIndex(node) {
       return tryInt(ci);
     default: {
       const matchValue_1 = node.TryGetPropertyAsSingleton(orderName);
-      let matchResult_1, ci_1;
+      let matchResult_1 = void 0, ci_1 = void 0;
       if (matchValue_1 != null) {
         if (typeof value(matchValue_1) === "string") {
           matchResult_1 = 0;
@@ -59,7 +59,7 @@ function setIndex(node, index) {
   node.SetProperty(columndIndexProperty, int32ToString(index));
 }
 function ARCtrl_ROCrate_LDNode__LDNode_GetColumnIndex(this$) {
-  return value(tryGetIndex(this$));
+  return value(tryGetIndex(this$)) | 0;
 }
 function ARCtrl_ROCrate_LDNode__LDNode_TryGetColumnIndex(this$) {
   return tryGetIndex(this$);

package/dist/ts/ts/Conversion/Datamap.d.ts

@@ -1,7 +1,7 @@
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { LDGraph, LDNode } from '../ROCrate/LDObject.js';
-import { Datamap } from '../Core/Datamap.js';
-import { LDContext } from '../ROCrate/LDContext.js';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { LDGraph, LDNode } from '../ROCrate/LDObject.ts';
+import { Datamap } from '../Core/Datamap.ts';
+import { LDContext } from '../ROCrate/LDContext.ts';
 export declare class DatamapConversion {
     constructor();
 }

package/dist/ts/ts/Conversion/Datamap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Datamap.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Datamap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,iBAAiB;;CAG7B;AAED,wBAAgB,6BAA6B,IAAI,QAAQ,CAExD;AAED,wBAAgB,qDAAqD,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAEhG;AAED,wBAAgB,wDAAwD,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,CAErJ"}
+{"version":3,"file":"Datamap.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Datamap.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,iBAAiB;;CAG7B;AAED,wBAAgB,6BAA6B,IAAI,QAAQ,CAExD;AAED,wBAAgB,qDAAqD,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAEhG;AAED,wBAAgB,wDAAwD,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,OAAO,CAErJ"}

package/dist/ts/ts/Conversion/Datamap.js

@@ -1,8 +1,8 @@
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { ResizeArray_map } from '../Core/Helper/Collections.js';
 import { BaseTypes_composeFragmentDescriptor_Z4C0BEF62, BaseTypes_decomposeFragmentDescriptor_Z6839B9E8 } from './Basic.js';
 import { Datamap } from '../Core/Datamap.js';
-import { unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 
 class DatamapConversion {
   constructor() {

package/dist/ts/ts/Conversion/DateTime.d.ts

@@ -1,4 +1,4 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
 export declare function tryFromString(s: string): Option<Date>;
 export declare function toString(d: Date): string;
 //# sourceMappingURL=DateTime.d.ts.map

package/dist/ts/ts/Conversion/DateTime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateTime.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/DateTime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAI/D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAWrD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,CAExC"}
+{"version":3,"file":"DateTime.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/DateTime.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAI/D,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAWrD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,CAExC"}

package/dist/ts/ts/Conversion/DateTime.js

@@ -1,16 +1,17 @@
-import { fromString } from '../fable_modules/Thoth.Json.JavaScript.0.4.1/Decode.fs.js';
+import { fromString } from '../fable_modules/Thoth.Json.JavaScript.0.5.0/Decode.fs.js';
 import { Decode_datetime } from '../Json/Decode.js';
-import { toText, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { toString as toString$1 } from '../fable_modules/Thoth.Json.JavaScript.0.4.1/Encode.fs.js';
+import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { toText, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { toString as toString$1 } from '../fable_modules/Thoth.Json.JavaScript.0.5.0/Encode.fs.js';
 import { dateTime } from '../Json/Encode.js';
 
 function tryFromString(s) {
-  let matchValue;
+  let matchValue = void 0;
   try {
     return matchValue = fromString(Decode_datetime, s), matchValue.tag === /* Error */
     1 ? (() => {
-      let arg;
-      throw new Error((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
+      let arg = void 0;
+      throw new Exception((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
     })() : matchValue.fields[0];
   } catch (matchValue_1) {
     return void 0;

package/dist/ts/ts/Conversion/Investigation.d.ts

@@ -1,8 +1,8 @@
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { LDGraph, LDNode } from '../ROCrate/LDObject.js';
-import { ArcInvestigation } from '../Core/ArcTypes.js';
-import { FileSystem } from '../FileSystem/FileSystem.js';
-import { LDContext } from '../ROCrate/LDContext.js';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { LDGraph, LDNode } from '../ROCrate/LDObject.ts';
+import { ArcInvestigation } from '../Core/ArcTypes.ts';
+import { FileSystem } from '../FileSystem/FileSystem.ts';
+import { LDContext } from '../ROCrate/LDContext.ts';
 export declare class InvestigationConversion {
     constructor();
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Investigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAOjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,gBAAgB,EAA2C,MAAM,qBAAqB,CAAC;AAKhG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,uBAAuB;;CAGnC;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sDAAsD,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CA0CzJ;AAED,wBAAgB,wDAAwD,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAetJ"}
+{"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Investigation.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAQjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,gBAAgB,EAA2C,MAAM,qBAAqB,CAAC;AAMhG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,uBAAuB;;CAGnC;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sDAAsD,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CA4CzJ;AAED,wBAAgB,wDAAwD,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAmBtJ"}

package/dist/ts/ts/Conversion/Investigation.js

@@ -1,12 +1,13 @@
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
-import { value, bind, defaultArg, unwrap, map } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
+import { value, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { tryFromString, toString } from './DateTime.js';
-import { now } from '../../node_modules/@fable-org/fable-library-js/Date.js';
+import { now } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
 import { Option_fromSeq, ResizeArray_map, ResizeArray_choose, ResizeArray_filter } from '../Core/Helper/Collections.js';
 import { ScholarlyArticleConversion_composeScholarlyArticle_D324A6D, ScholarlyArticleConversion_decomposeScholarlyArticle_Z6839B9E8 } from './ScholarlyArticle.js';
 import { PersonConversion_composePerson_2B0BECCC, PersonConversion_decomposePerson_Z6839B9E8 } from './Person.js';
 import { BaseTypes_composeComment_Z13201A7E, BaseTypes_decomposeComment_Z2F770004 } from './Basic.js';
-import { toList, delay, append } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { toList, delay, append } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { AssayConversion_composeAssay_Z5C53FD5C, AssayConversion_decomposeAssay_Z6839B9E8 } from './Assay.js';
 import { ArcInvestigation } from '../Core/ArcTypes.js';
 import { StudyConversion_composeStudy_ZFE0E38E, StudyConversion_decomposeStudy_Z6839B9E8 } from './Study.js';
@@ -22,16 +23,18 @@ function InvestigationConversion_$reflection() {
   return class_type("ARCtrl.Conversion.InvestigationConversion", void 0, InvestigationConversion);
 }
 function InvestigationConversion_composeInvestigation_Z284BC0AC(investigation, fs, ignoreBrokenWR) {
-  let collection;
+  let option_3 = void 0, collection = void 0;
   let name;
   const matchValue = investigation.Title;
   if (matchValue == null) {
-    throw new Error("Investigation must have a title");
+    throw new Exception("Investigation must have a title");
   } else {
     name = value(matchValue);
   }
-  const dateCreated = bind(tryFromString, investigation.SubmissionDate);
-  const datePublished = defaultArg(bind(tryFromString, investigation.PublicReleaseDate), now());
+  let dateCreated;
+  const option_1 = investigation.SubmissionDate;
+  dateCreated = option_1 != null ? tryFromString(value(option_1)) : void 0;
+  const datePublished = defaultArg((option_3 = investigation.PublicReleaseDate, option_3 != null ? tryFromString(value(option_3)) : void 0), now());
   const publications = Option_fromSeq(ResizeArray_map(ScholarlyArticleConversion_composeScholarlyArticle_D324A6D, investigation.Publications));
   const creators = Option_fromSeq(ResizeArray_map((c) => PersonConversion_composePerson_2B0BECCC(c, investigation.GetAllPersons()), investigation.Contacts));
   const comments = Option_fromSeq(ResizeArray_map(BaseTypes_composeComment_Z13201A7E, investigation.Comments));
@@ -63,8 +66,12 @@ function InvestigationConversion_decomposeInvestigation_Z6839B9E8(investigation,
   let title;
   const matchValue = LDDataset.tryGetNameAsString(investigation, unwrap(context));
   title = matchValue == null ? LDDataset.tryGetHeadlineAsString(investigation, unwrap(context)) : value(matchValue);
-  const dateCreated = map(toString, LDDataset.tryGetDateCreatedAsDateTime(investigation, unwrap(context)));
-  const datePublished = map(toString, LDDataset.tryGetDatePublishedAsDateTime(investigation, unwrap(context)));
+  let dateCreated;
+  const option_1 = LDDataset.tryGetDateCreatedAsDateTime(investigation, unwrap(context));
+  dateCreated = option_1 != null ? toString(value(option_1)) : void 0;
+  let datePublished;
+  const option_3 = LDDataset.tryGetDatePublishedAsDateTime(investigation, unwrap(context));
+  datePublished = option_3 != null ? toString(value(option_3)) : void 0;
   const publications = ResizeArray_map((p) => ScholarlyArticleConversion_decomposeScholarlyArticle_Z6839B9E8(p, unwrap(graph), unwrap(context)), LDDataset.getCitations(investigation, unwrap(graph), unwrap(context)));
   const creators = ResizeArray_map((c) => PersonConversion_decomposePerson_Z6839B9E8(c, unwrap(graph), unwrap(context)), LDDataset.getCreators(investigation, unwrap(graph), unwrap(context)));
   const datasets = LDDataset.getHasPartsAsDataset(investigation, unwrap(graph), unwrap(context));

package/dist/ts/ts/Conversion/Person.d.ts

@@ -1,7 +1,7 @@
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { LDGraph, LDNode } from '../ROCrate/LDObject.js';
-import { LDContext } from '../ROCrate/LDContext.js';
-import { Person } from '../Core/Person.js';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { LDGraph, LDNode } from '../ROCrate/LDObject.ts';
+import { LDContext } from '../ROCrate/LDContext.ts';
+import { Person } from '../Core/Person.ts';
 export declare class PersonConversion {
     constructor();
 }

package/dist/ts/ts/Conversion/Person.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Person.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Person.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAU3C,qBAAa,gBAAgB;;CAG5B;AAED,wBAAgB,4BAA4B,IAAI,QAAQ,CAEvD;AAED,wBAAgB,6BAA6B,IAAI,MAAM,CAEtD;AAED,wBAAgB,6CAA6C,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAczF;AAED,wBAAgB,+CAA+C,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAOhH;AAED,wBAAgB,yCAAyC,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAW9E;AAED,wBAAgB,0CAA0C,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAU/E;AAED,wBAAgB,uCAAuC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CA+B1G;AAED,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAevH"}
+{"version":3,"file":"Person.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Person.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAS3C,qBAAa,gBAAgB;;CAG5B;AAED,wBAAgB,4BAA4B,IAAI,QAAQ,CAEvD;AAED,wBAAgB,6BAA6B,IAAI,MAAM,CAEtD;AAED,wBAAgB,6CAA6C,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAczF;AAED,wBAAgB,+CAA+C,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAOhH;AAED,wBAAgB,yCAAyC,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAW9E;AAED,wBAAgB,0CAA0C,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAU/E;AAED,wBAAgB,uCAAuC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CA+C1G;AAED,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAiBvH"}

package/dist/ts/ts/Conversion/Person.js

@@ -1,18 +1,18 @@
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { LDOrganization } from '../ROCrate/LDTypes/Organization.js';
-import { fromString } from '../fable_modules/Thoth.Json.JavaScript.0.4.1/Decode.fs.js';
+import { fromString } from '../fable_modules/Thoth.Json.JavaScript.0.5.0/Decode.fs.js';
 import { decoder, encoder } from '../Json/ROCrate/LDNode.js';
 import { LDNode } from '../ROCrate/LDObject.js';
-import { toText, printf, toFail } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { isEmpty, filter, tryFind } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { unwrap, bind, value, map } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { toString } from '../fable_modules/Thoth.Json.JavaScript.0.4.1/Encode.fs.js';
+import { Exception, equals } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { toText, printf, toFail } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { isEmpty, filter, tryFind } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { unwrap, value, some } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { toString } from '../fable_modules/Thoth.Json.JavaScript.0.5.0/Encode.fs.js';
 import { Person } from '../Core/Person.js';
-import { equals } from '../../node_modules/@fable-org/fable-library-js/Util.js';
 import { tryGetOrcidNumber } from '../Core/Helper/ORCID.js';
 import { Option_fromSeq, ResizeArray_map } from '../Core/Helper/Collections.js';
 import { BaseTypes_composeDefinedTerm_ZDED3A0F, BaseTypes_decomposeDefinedTerm_Z2F770004 } from './Basic.js';
-import { toString as toString$1 } from '../../node_modules/@fable-org/fable-library-js/Types.js';
+import { toString as toString$1 } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
 import { Comment$ } from '../Core/Comment.js';
 import { LDPerson } from '../ROCrate/LDTypes/Person.js';
 
@@ -27,12 +27,12 @@ function PersonConversion_get_orcidKey() {
   return "ORCID";
 }
 function PersonConversion_composeAffiliation_Z721C83C5(affiliation) {
-  let arg;
+  let arg = void 0;
   try {
     const matchValue = fromString(decoder, affiliation);
     if (matchValue.tag === /* Error */
     1) {
-      throw new Error((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
+      throw new Exception((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
     } else {
       return matchValue.fields[0];
     }
@@ -48,12 +48,12 @@ function PersonConversion_decomposeAffiliation_Z2F770004(affiliation, context) {
   }
 }
 function PersonConversion_composeAddress_Z721C83C5(address) {
-  let matchValue;
+  let matchValue = void 0;
   try {
     return matchValue = fromString(decoder, address), matchValue.tag === /* Error */
     1 ? (() => {
-      let arg;
-      throw new Error((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
+      let arg = void 0;
+      throw new Exception((arg = matchValue.fields[0], toText(printf("Error decoding string: %O"))(arg)));
     })() : matchValue.fields[0];
   } catch (matchValue_1) {
     return address;
@@ -65,20 +65,30 @@ function PersonConversion_decomposeAddress_4E60E31B(address) {
   } else if (address instanceof LDNode) {
     return toString(0, encoder(address));
   } else {
-    throw new Error("Address must be a string or a Json.LDNode");
+    throw new Exception("Address must be a string or a Json.LDNode");
   }
 }
 function PersonConversion_composePerson_2B0BECCC(person, persons) {
   let orcid;
   const matchValue = person.ORCID;
   if (matchValue == null) {
-    orcid = persons == null ? void 0 : bind((p_1) => p_1.ORCID, tryFind((p) => {
-      if (equals(p.FirstName, person.FirstName)) {
-        return equals(p.LastName, person.LastName);
+    if (persons == null) {
+      orcid = void 0;
+    } else {
+      const option_1 = tryFind((p) => {
+        if (equals(p.FirstName, person.FirstName)) {
+          return equals(p.LastName, person.LastName);
+        } else {
+          return false;
+        }
+      }, value(persons));
+      if (option_1 != null) {
+        const p_1 = value(option_1);
+        orcid = p_1.ORCID;
       } else {
-        return false;
+        orcid = void 0;
       }
-    }, value(persons)));
+    }
   } else {
     const o = value(matchValue);
     const matchValue_1 = tryGetOrcidNumber(o);
@@ -87,14 +97,18 @@ function PersonConversion_composePerson_2B0BECCC(person, persons) {
   let givenName;
   const matchValue_2 = person.FirstName;
   if (matchValue_2 == null) {
-    throw new Error("Person must have a given name");
+    throw new Exception("Person must have a given name");
   } else {
     givenName = value(matchValue_2);
   }
   const jobTitles = Option_fromSeq(ResizeArray_map(BaseTypes_composeDefinedTerm_ZDED3A0F, person.Roles));
   const disambiguatingDescriptions = Option_fromSeq(ResizeArray_map(toString$1, person.Comments));
-  const address_1 = map(PersonConversion_composeAddress_Z721C83C5, person.Address);
-  const affiliation_1 = map(PersonConversion_composeAffiliation_Z721C83C5, person.Affiliation);
+  let address_1;
+  const option_3 = person.Address;
+  address_1 = option_3 != null ? some(PersonConversion_composeAddress_Z721C83C5(value(option_3))) : void 0;
+  let affiliation_1;
+  const option_5 = person.Affiliation;
+  affiliation_1 = option_5 != null ? PersonConversion_composeAffiliation_Z721C83C5(value(option_5)) : void 0;
   return LDPerson.create(givenName, unwrap(orcid), void 0, unwrap(affiliation_1), unwrap(person.EMail), unwrap(person.LastName), void 0, unwrap(jobTitles), unwrap(person.MidInitials), address_1, unwrap(disambiguatingDescriptions), unwrap(person.Fax), unwrap(person.Phone));
 }
 function PersonConversion_decomposePerson_Z6839B9E8(person, graph, context) {
@@ -109,7 +123,9 @@ function PersonConversion_decomposePerson_Z6839B9E8(person, graph, context) {
   }
   const roles = ResizeArray_map((r) => BaseTypes_decomposeDefinedTerm_Z2F770004(r, unwrap(context)), LDPerson.getJobTitlesAsDefinedTerm(person, unwrap(graph), unwrap(context)));
   const comments = ResizeArray_map((s_1) => Comment$.fromString(s_1), LDPerson.getDisambiguatingDescriptionsAsString(person, unwrap(context)));
-  const affiliation = map((a_3) => PersonConversion_decomposeAffiliation_Z2F770004(a_3, unwrap(context)), LDPerson.tryGetAffiliation(person, unwrap(graph), unwrap(context)));
+  let affiliation;
+  const option_1 = LDPerson.tryGetAffiliation(person, unwrap(graph), unwrap(context));
+  affiliation = option_1 != null ? PersonConversion_decomposeAffiliation_Z2F770004(value(option_1), unwrap(context)) : void 0;
   return Person.create(unwrap(orcid), unwrap(LDPerson.tryGetFamilyNameAsString(person, unwrap(context))), LDPerson.getGivenNameAsString(person, unwrap(context)), unwrap(LDPerson.tryGetAdditionalNameAsString(person, unwrap(context))), unwrap(LDPerson.tryGetEmailAsString(person, unwrap(context))), unwrap(LDPerson.tryGetTelephoneAsString(person, unwrap(context))), unwrap(LDPerson.tryGetFaxNumberAsString(person, unwrap(context))), unwrap(address), unwrap(affiliation), roles, comments);
 }