@nfdi4plants/arctrl 3.1.0 → 3.1.1

package/dist/ts/ts/CWL/Encode.js

@@ -1,16 +1,25 @@
 import { FSharpChoice$2_Choice1Of2, FSharpChoice$2_Choice2Of2 } from '../../node_modules/@fable-org/fable-library-js/Choice.js';
+import { FileInstance, DirectoryInstance, DirentInstance, InputRecordField, InputRecordSchema, InputEnumSchema, InputArraySchema, SchemaDefRequirementType, SoftwarePackage } from './CWLTypes.js';
 import { map, value, bind, filter } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { toList, map as map$2, choose as choose$1, fold, delay, append as append$1, singleton as singleton$1, empty as empty$1 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { isEmpty, head, tail, map as map$1, singleton, ofArray, empty, append, ofSeq, choose, exists, cons, filter as filter$1, contains, tryFind, reverse, length } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { YAMLElement_Value, YAMLContent_create_Z1C3A29C9, YAMLElement_Object, YAMLElement_Mapping, ScalarStyle_Block, BlockScalarStyle_Literal, ChompingMode_Clip, ScalarStyle_DoubleQuoted, YAMLElement_Sequence, YAMLElement, Config } from '../fable_modules/YAMLicious.1.0.0-alpha.7/YAMLiciousTypes.fs.js';
+import { toList, choose, fold, map as map$2, delay, append as append$1, singleton as singleton$1, empty as empty$2 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { isEmpty, head, tail, map as map$1, append, singleton, ofArray, empty as empty$1, ofSeq, length, choose as choose$1, filter as filter$1, contains, tryFind, reverse, cons } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { YAMLElement_Value, YAMLContent_create_Z1C3A29C9, YAMLElement_Object, YAMLElement_Mapping, YAMLElement, YAMLElement_Sequence, ScalarStyle_Block, BlockScalarStyle_Literal, ChompingMode_Clip, ScalarStyle_DoubleQuoted, Config } from '../fable_modules/YAMLicious.1.0.0-alpha.11/YAMLiciousTypes.fs.js';
+import { equals, defaultOf, int64ToString, isIterable, comparePrimitives, curry2, stringHash } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { string, int } from '../fable_modules/YAMLicious.1.0.0-alpha.11/Encode.fs.js';
+import { DynamicObj } from '../fable_modules/DynamicObj.7.1.0/DynamicObj.fs.js';
+import { dynamicPropertiesExcept } from './DynamicObjHelpers.js';
+import { empty, ofSeq as ofSeq$1, ofList, FSharpSet__Contains } from '../../node_modules/@fable-org/fable-library-js/Set.js';
 import { trimEnd, replace, toText, interpolate, trimStart, join, split } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { string, int, float } from '../fable_modules/YAMLicious.1.0.0-alpha.7/Encode.fs.js';
-import { LoadListingEnum_get_toCwlString } from './Requirements.js';
-import { int64ToString, stringHash, comparePrimitives } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { LoadListingEnum_get_toCwlString, InlineJavascriptRequirementValue, InplaceUpdateRequirementValue, NetworkAccessRequirementValue, WorkReuseRequirementValue, ResourceRequirementInstance, EnvironmentDef, LoadListingRequirementValue, DockerRequirement } from './Requirements.js';
+import { OutputBinding, CWLOutput } from './Outputs.js';
+import { InputBinding, CWLInput } from './Inputs.js';
+import { StepInput, StepOutputParameter, WorkflowStep } from './WorkflowSteps.js';
 import { WorkflowStepRunOps_tryGetOperation, WorkflowStepRunOps_tryGetExpressionTool, WorkflowStepRunOps_tryGetWorkflow, WorkflowStepRunOps_tryGetTool } from './CWLProcessingUnit.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-js/Types.js';
-import { write } from '../fable_modules/YAMLicious.1.0.0-alpha.7/Writer.fs.js';
-import { ofList, FSharpSet__Contains } from '../../node_modules/@fable-org/fable-library-js/Set.js';
+import { CWLToolDescription } from './ToolDescription.js';
+import { CWLWorkflowDescription } from './WorkflowDescription.js';
+import { CWLExpressionToolDescription } from './ExpressionToolDescription.js';
+import { CWLOperationDescription } from './OperationDescription.js';
+import { write } from '../fable_modules/YAMLicious.1.0.0-alpha.11/Writer.fs.js';
 
 function $007CPrimitiveType$007CComplexType$007C(t) {
   switch (t.tag) {
@@ -54,7 +63,8 @@ function $007CPrimitiveType$007CComplexType$007C(t) {
     case /* Array */
     11: {
       const arraySchema = t.fields[0];
-      if ($007CPrimitiveType$007CComplexType$007C(arraySchema.Items).tag === /* Choice2Of2 */
+      const matchValue = arraySchema.Items;
+      if ($007CPrimitiveType$007CComplexType$007C(matchValue).tag === /* Choice2Of2 */
       1) {
         return FSharpChoice$2_Choice2Of2(void 0);
       } else {
@@ -107,8 +117,10 @@ function isComplexType(t_mut) {
         13:
           return true;
         case /* Array */
-        11:
-          return tryGetArrayShorthand(t.fields[0].Items) == null;
+        11: {
+          const arraySchema = t.fields[0];
+          return tryGetArrayShorthand(arraySchema.Items) == null;
+        }
         case /* Union */
         14: {
           const typesList = toList(t.fields[0]);
@@ -162,15 +174,62 @@ function isComplexType(t_mut) {
 function yBool(b) {
   return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(b ? "true" : "false"));
 }
+function yFloat(value) {
+  return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(value.toString()));
+}
 function yMap(pairs) {
   return YAMLElement_Object(map$1((tupledArg) => {
     let _arg, single;
     return YAMLElement_Mapping(YAMLContent_create_Z1C3A29C9(tupledArg[0]), (_arg = tupledArg[1], _arg.tag === /* Object */
     3 ? !isEmpty(_arg.fields[0]) ? head(_arg.fields[0]).tag === /* Value */
     1 ? isEmpty(tail(_arg.fields[0])) ? _arg : _arg : head(_arg.fields[0]).tag === /* Alias */
-    7 ? isEmpty(tail(_arg.fields[0])) ? _arg : _arg : isEmpty(tail(_arg.fields[0])) ? (single = head(_arg.fields[0]), single) : _arg : YAMLElement_Value(YAMLContent_create_Z1C3A29C9("{}")) : _arg));
+    7 ? isEmpty(tail(_arg.fields[0])) ? _arg : _arg : isEmpty(tail(_arg.fields[0])) ? (single = head(_arg.fields[0]), single) : _arg : _arg : _arg));
   }, pairs));
 }
+function encodeDynamicValue(value) {
+  if (equals(value, defaultOf())) {
+    return void 0;
+  } else if (typeof value === "string") {
+    const s = value;
+    return string(s);
+  } else if (typeof value === "boolean") {
+    const b = value;
+    return yBool(b);
+  } else if (typeof value === "number") {
+    const f = value;
+    return yFloat(f);
+  } else if (typeof value === "number") {
+    const i = value | 0;
+    return int(i);
+  } else if (typeof value === "bigint") {
+    const i_1 = value;
+    return string(int64ToString(i_1));
+  } else if (value instanceof YAMLElement) {
+    const y = value;
+    return y;
+  } else if (value instanceof DynamicObj) {
+    const dynObj = value;
+    return encodeDynamicObj(dynObj);
+  } else if (isIterable(value)) {
+    const values = value;
+    return YAMLElement_Sequence(toList(choose(encodeDynamicValue, values)));
+  } else {
+    return void 0;
+  }
+}
+function encodeDynamicObj(dynObj) {
+  return yMap(toList(choose((kvp) => map((encoded) => [kvp[0], encoded], encodeDynamicValue(kvp[1])), dynamicPropertiesExcept(empty({
+    Compare: comparePrimitives
+  }), dynObj))));
+}
+function appendDynamicPropertiesExcept(knownFieldNames, dynObj, acc) {
+  return fold((pairs, pair) => append(pairs, singleton(pair)), acc, choose((kvp) => map((encoded) => [kvp[0], encoded], encodeDynamicValue(kvp[1])), dynamicPropertiesExcept(knownFieldNames, dynObj)));
+}
+function appendDynamicProperties(dynObj, acc) {
+  return appendDynamicPropertiesExcept(empty({
+    Compare: comparePrimitives
+  }), dynObj, acc);
+}
 function normalizeDocString(doc) {
   return trimEnd(trimEnd(replace(doc, "\r\n", "\n"), "\n"), "\r");
 }
@@ -203,8 +262,8 @@ function encodeEnvVarRequirementCompactMap(envs) {
 }
 function encodeSoftwareRequirementCompactMap(packages) {
   const packagesMap = yMap(toList(map$2((package$_1) => {
-    let package$, matchValue_1, value_6, acc_3, value_3, acc_1;
-    return [package$_1.Package, (package$ = package$_1, matchValue_1 = package$.Specs, package$.Version == null ? matchValue_1 != null ? YAMLElement_Sequence(toList(map$2(string, value(matchValue_1)))) : yMap(empty()) : yMap((value_6 = package$.Specs, acc_3 = (value_3 = package$.Version, acc_1 = empty(), value_3 == null ? acc_1 : append(acc_1, singleton(["version", YAMLElement_Sequence(toList(map$2(string, value(value_3))))]))), value_6 == null ? acc_3 : append(acc_3, singleton(["specs", YAMLElement_Sequence(toList(map$2(string, value(value_6))))])))))];
+    let package$, matchValue, matchValue_1, acc_2, value_3, acc_1, value_6, acc_3;
+    return [package$_1.Package, (package$ = package$_1, matchValue = package$.Version, matchValue_1 = package$.Specs, matchValue == null ? matchValue_1 != null ? YAMLElement_Sequence(toList(map$2(string, value(matchValue_1)))) : yMap(empty$1()) : yMap((acc_2 = (value_3 = package$.Version, acc_1 = empty$1(), value_3 == null ? acc_1 : append(acc_1, singleton(["version", YAMLElement_Sequence(toList(map$2(string, value(value_3))))]))), value_6 = package$.Specs, acc_3 = acc_2, value_6 == null ? acc_3 : append(acc_3, singleton(["specs", YAMLElement_Sequence(toList(map$2(string, value(value_6))))])))))];
   }, packages)));
   return yMap(ofArray([["class", string("SoftwareRequirement")], ["packages", packagesMap]]));
 }
@@ -217,16 +276,89 @@ function encodeDoc(doc) {
 function encodeIntent(intent) {
   return ["intent", YAMLElement_Sequence(ofSeq(map$2(string, intent)))];
 }
+function encodeFilePairs(discriminatorKey, discriminatorValue, file) {
+  let acc_22;
+  let acc_20;
+  let acc_18;
+  let acc_16;
+  let acc_14;
+  let acc_12;
+  let acc_10;
+  let acc_8;
+  let acc_6;
+  let acc_4;
+  let acc_2;
+  const acc = singleton([discriminatorKey, string(discriminatorValue)]);
+  const value_2 = file.Location;
+  const acc_1 = acc;
+  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["location", string(value(value_2))]));
+  const value_5 = file.Path;
+  const acc_3 = acc_2;
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["path", string(value(value_5))]));
+  const value_8 = file.Basename;
+  const acc_5 = acc_4;
+  acc_6 = value_8 == null ? acc_5 : append(acc_5, singleton(["basename", string(value(value_8))]));
+  const value_11 = file.Dirname;
+  const acc_7 = acc_6;
+  acc_8 = value_11 == null ? acc_7 : append(acc_7, singleton(["dirname", string(value(value_11))]));
+  const value_14 = file.Nameroot;
+  const acc_9 = acc_8;
+  acc_10 = value_14 == null ? acc_9 : append(acc_9, singleton(["nameroot", string(value(value_14))]));
+  const value_17 = file.Nameext;
+  const acc_11 = acc_10;
+  acc_12 = value_17 == null ? acc_11 : append(acc_11, singleton(["nameext", string(value(value_17))]));
+  const value_20 = file.Checksum;
+  const acc_13 = acc_12;
+  acc_14 = value_20 == null ? acc_13 : append(acc_13, singleton(["checksum", string(value(value_20))]));
+  const value_22 = file.Size;
+  const acc_15 = acc_14;
+  acc_16 = value_22 == null ? acc_15 : append(acc_15, singleton(["size", YAMLElement_Value(YAMLContent_create_Z1C3A29C9(int64ToString(value(value_22))))]));
+  const value_24 = file.SecondaryFiles;
+  const acc_17 = acc_16;
+  acc_18 = value_24 == null ? acc_17 : append(acc_17, singleton(["secondaryFiles", value(value_24)]));
+  const value_27 = file.Format;
+  const acc_19 = acc_18;
+  acc_20 = value_27 == null ? acc_19 : append(acc_19, singleton(["format", string(value(value_27))]));
+  const value_30 = file.Contents;
+  const acc_21 = acc_20;
+  acc_22 = value_30 == null ? acc_21 : append(acc_21, singleton(["contents", string(value(value_30))]));
+  return appendDynamicPropertiesExcept(FileInstance.KnownFieldNames, file, acc_22);
+}
+function encodeDirectoryPairs(discriminatorKey, discriminatorValue, directory) {
+  let acc_8;
+  let acc_6;
+  let acc_4;
+  let acc_2;
+  const acc = singleton([discriminatorKey, string(discriminatorValue)]);
+  const value_2 = directory.Location;
+  const acc_1 = acc;
+  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["location", string(value(value_2))]));
+  const value_5 = directory.Path;
+  const acc_3 = acc_2;
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["path", string(value(value_5))]));
+  const value_8 = directory.Basename;
+  const acc_5 = acc_4;
+  acc_6 = value_8 == null ? acc_5 : append(acc_5, singleton(["basename", string(value(value_8))]));
+  const value_10 = directory.Listing;
+  const acc_7 = acc_6;
+  acc_8 = value_10 == null ? acc_7 : append(acc_7, singleton(["listing", value(value_10)]));
+  return appendDynamicPropertiesExcept(DirectoryInstance.KnownFieldNames, directory, acc_8);
+}
 function encodeCWLType(t) {
-  let value_4, acc_3, value_2, acc_1;
+  let acc_4, acc_2, acc, value_2, acc_1, value_4, acc_3;
   switch (t.tag) {
     case /* Directory */
     1:
-      return string("Directory");
+      if (length(encodeDirectoryPairs("type", "Directory", t.fields[0])) > 1) {
+        const directory_2 = t.fields[0];
+        return yMap(encodeDirectoryPairs("type", "Directory", directory_2));
+      } else {
+        return string("Directory");
+      }
     case /* Dirent */
     2: {
       const d = t.fields[0];
-      return yMap((value_4 = d.Writable, acc_3 = (value_2 = d.Entryname, acc_1 = singleton(["entry", encodeSchemaSaladString(d.Entry)]), value_2 == null ? acc_1 : append(acc_1, singleton(["entryname", encodeSchemaSaladString(value(value_2))]))), value_4 == null ? acc_3 : append(acc_3, singleton(["writable", yBool(value(value_4))]))));
+      return yMap((acc_4 = (acc_2 = (acc = singleton(["entry", encodeSchemaSaladString(d.Entry)]), value_2 = d.Entryname, acc_1 = acc, value_2 == null ? acc_1 : append(acc_1, singleton(["entryname", encodeSchemaSaladString(value(value_2))]))), value_4 = d.Writable, acc_3 = acc_2, value_4 == null ? acc_3 : append(acc_3, singleton(["writable", yBool(value(value_4))]))), appendDynamicPropertiesExcept(DirentInstance.KnownFieldNames, d, acc_4)));
     }
     case /* String */
     3:
@@ -254,7 +386,8 @@ function encodeCWLType(t) {
       return string("null");
     case /* Union */
     14: {
-      const typesList = toList(t.fields[0]);
+      const types = t.fields[0];
+      const typesList = toList(types);
       let matchResult, otherType;
       if (!isEmpty(typesList)) {
         if (head(typesList).tag === /* Null */
@@ -342,32 +475,57 @@ function encodeCWLType(t) {
       }
     }
     case /* Record */
-    12:
-      return encodeInputRecordSchema(t.fields[0]);
+    12: {
+      const recordSchema = t.fields[0];
+      return encodeInputRecordSchema(recordSchema);
+    }
     case /* Enum */
-    13:
-      return encodeInputEnumSchema(t.fields[0]);
+    13: {
+      const enumSchema = t.fields[0];
+      return encodeInputEnumSchema(enumSchema);
+    }
     default:
-      return string("File");
+      if (length(encodeFilePairs("type", "File", t.fields[0])) > 1) {
+        const file_2 = t.fields[0];
+        return yMap(encodeFilePairs("type", "File", file_2));
+      } else {
+        return string("File");
+      }
   }
 }
 function encodeInputRecordField(field) {
-  return [field.Name, yMap(singleton(["type", encodeCWLType(field.Type)]))];
+  let pairs;
+  let acc_4;
+  let acc_2;
+  const acc = singleton(["type", encodeCWLType(field.Type)]);
+  const value_2 = field.Doc;
+  const acc_1 = acc;
+  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["doc", string(value(value_2))]));
+  const value_5 = field.Label;
+  const acc_3 = acc_2;
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["label", string(value(value_5))]));
+  pairs = appendDynamicPropertiesExcept(InputRecordField.KnownFieldNames, field, acc_4);
+  return [field.Name, yMap(pairs)];
 }
 function encodeInputRecordSchema(schema) {
+  let acc_6, acc_4, acc_2, acc, value_2, acc_1, value_5, acc_3, value_8, acc_5;
   let fieldsElement;
   const matchValue = schema.Fields;
-  fieldsElement = matchValue == null ? yMap(empty()) : yMap(toList(map$2(encodeInputRecordField, value(matchValue))));
-  return yMap(ofArray([["type", string("record")], ["fields", fieldsElement]]));
+  fieldsElement = matchValue == null ? yMap(empty$1()) : yMap(toList(map$2(encodeInputRecordField, value(matchValue))));
+  return yMap((acc_6 = (acc_4 = (acc_2 = (acc = ofArray([["type", string("record")], ["fields", fieldsElement]]), value_2 = schema.Label, acc_1 = acc, value_2 == null ? acc_1 : append(acc_1, singleton(["label", string(value(value_2))]))), value_5 = schema.Doc, acc_3 = acc_2, value_5 == null ? acc_3 : append(acc_3, singleton(["doc", string(value(value_5))]))), value_8 = schema.Name, acc_5 = acc_4, value_8 == null ? acc_5 : append(acc_5, singleton(["name", string(value(value_8))]))), appendDynamicPropertiesExcept(InputRecordSchema.KnownFieldNames, schema, acc_6)));
 }
 function encodeInputEnumSchema(schema) {
-  return yMap(append(singleton(["type", string("enum")]), singleton(["symbols", YAMLElement_Sequence(ofSeq(map$2(string, schema.Symbols)))])));
+  let acc_6, acc_4, acc_2, value_3, acc_1, value_6, acc_3, value_9, acc_5;
+  const pairs = append(singleton(["type", string("enum")]), singleton(["symbols", YAMLElement_Sequence(ofSeq(map$2(string, schema.Symbols)))]));
+  return yMap((acc_6 = (acc_4 = (acc_2 = (value_3 = schema.Label, acc_1 = pairs, value_3 == null ? acc_1 : append(acc_1, singleton(["label", string(value(value_3))]))), value_6 = schema.Doc, acc_3 = acc_2, value_6 == null ? acc_3 : append(acc_3, singleton(["doc", string(value(value_6))]))), value_9 = schema.Name, acc_5 = acc_4, value_9 == null ? acc_5 : append(acc_5, singleton(["name", string(value(value_9))]))), appendDynamicPropertiesExcept(InputEnumSchema.KnownFieldNames, schema, acc_6)));
 }
 function encodeInputArraySchema(schema) {
-  return yMap(ofArray([["type", string("array")], ["items", encodeCWLType(schema.Items)]]));
+  let acc_6, acc_4, acc_2, acc, value_2, acc_1, value_5, acc_3, value_8, acc_5;
+  return yMap((acc_6 = (acc_4 = (acc_2 = (acc = ofArray([["type", string("array")], ["items", encodeCWLType(schema.Items)]]), value_2 = schema.Label, acc_1 = acc, value_2 == null ? acc_1 : append(acc_1, singleton(["label", string(value(value_2))]))), value_5 = schema.Doc, acc_3 = acc_2, value_5 == null ? acc_3 : append(acc_3, singleton(["doc", string(value(value_5))]))), value_8 = schema.Name, acc_5 = acc_4, value_8 == null ? acc_5 : append(acc_5, singleton(["name", string(value(value_8))]))), appendDynamicPropertiesExcept(InputArraySchema.KnownFieldNames, schema, acc_6)));
 }
 function encodeOutputBinding(ob) {
-  return yMap(choose((x) => x, singleton(map((g) => ["glob", string(g)], ob.Glob))));
+  let acc_6, acc_4, acc_2, acc, value_1, acc_1, encoder_1, f1, value_4, acc_3, value_7, acc_5;
+  return yMap((acc_6 = (acc_4 = (acc_2 = (acc = choose$1((x) => x, singleton(map((g) => ["glob", string(g)], ob.Glob))), value_1 = ob.LoadContents, acc_1 = acc, value_1 == null ? acc_1 : append(acc_1, singleton(["loadContents", yBool(value(value_1))]))), encoder_1 = (f1 = LoadListingEnum_get_toCwlString(), (arg) => string(f1(arg))), value_4 = ob.LoadListing, acc_3 = acc_2, value_4 == null ? acc_3 : append(acc_3, singleton(["loadListing", encoder_1(value(value_4))]))), value_7 = ob.OutputEval, acc_5 = acc_4, value_7 == null ? acc_5 : append(acc_5, singleton(["outputEval", string(value(value_7))]))), appendDynamicPropertiesExcept(OutputBinding.KnownFieldNames, ob, acc_6)));
 }
 function encodeStringArrayOrScalar(values) {
   if (values.length === 1) {
@@ -437,7 +595,8 @@ function encodeCWLOutput(o) {
                 return encodeCWLType(t);
               case /* Array */
               11: {
-                const matchValue = otherType.fields[0].Items;
+                const arraySchema = otherType.fields[0];
+                const matchValue = arraySchema.Items;
                 switch (matchValue.tag) {
                   case /* File */
                   0:
@@ -506,7 +665,8 @@ function encodeCWLOutput(o) {
     }
   }, o.Type_);
   let pairs;
-  let value_4;
+  let acc_16;
+  let value_17;
   const matchValue_2 = o.OutputSource;
   let matchResult_1, value$1, values_1;
   if (matchValue_2 != null) {
@@ -527,25 +687,46 @@ function encodeCWLOutput(o) {
   }
   switch (matchResult_1) {
     case 0: {
-      value_4 = string(value$1);
+      value_17 = string(value$1);
       break;
     }
     case 1: {
-      value_4 = encodeStringArrayOrScalar(values_1);
+      value_17 = encodeStringArrayOrScalar(values_1);
       break;
     }
     default:
-      value_4 = void 0;
+      value_17 = void 0;
   }
-  let acc_5;
+  let acc_15;
+  let acc_12;
+  let acc_10;
+  let acc_8;
+  let acc_6;
+  let acc_4;
   let acc_2;
   const value_1 = typeElement;
-  const acc_1 = empty();
+  const acc_1 = empty$1();
   acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["type", value(value_1)]));
-  const value_3 = o.OutputBinding;
+  const value_4 = o.Label;
   const acc_3 = acc_2;
-  acc_5 = value_3 == null ? acc_3 : append(acc_3, singleton(["outputBinding", encodeOutputBinding(value(value_3))]));
-  pairs = value_4 == null ? acc_5 : append(acc_5, singleton(["outputSource", value(value_4)]));
+  acc_4 = value_4 == null ? acc_3 : append(acc_3, singleton(["label", string(value(value_4))]));
+  const value_6 = o.SecondaryFiles;
+  const acc_5 = acc_4;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["secondaryFiles", value(value_6)]));
+  const value_8 = o.Streamable;
+  const acc_7 = acc_6;
+  acc_8 = value_8 == null ? acc_7 : append(acc_7, singleton(["streamable", yBool(value(value_8))]));
+  const value_11 = o.Doc;
+  const acc_9 = acc_8;
+  acc_10 = value_11 == null ? acc_9 : append(acc_9, singleton(["doc", string(value(value_11))]));
+  const value_14 = o.Format;
+  const acc_11 = acc_10;
+  acc_12 = value_14 == null ? acc_11 : append(acc_11, singleton(["format", string(value(value_14))]));
+  const value_16 = o.OutputBinding;
+  const acc_13 = acc_12;
+  acc_15 = value_16 == null ? acc_13 : append(acc_13, singleton(["outputBinding", encodeOutputBinding(value(value_16))]));
+  acc_16 = value_17 == null ? acc_15 : append(acc_15, singleton(["outputSource", value(value_17)]));
+  pairs = appendDynamicPropertiesExcept(CWLOutput.KnownFieldNames, o, acc_16);
   let matchResult_2, t_1;
   if (!isEmpty(pairs)) {
     if (head(pairs)[0] === "type") {
@@ -569,11 +750,19 @@ function encodeCWLOutput(o) {
   }
 }
 function encodeInputBinding(ib) {
-  let value_9, acc_7, value_7, acc_5, value_4, acc_3, value_2, acc_1;
-  return yMap((value_9 = ib.Separate, acc_7 = (value_7 = ib.ItemSeparator, acc_5 = (value_4 = ib.Position, acc_3 = (value_2 = ib.Prefix, acc_1 = empty(), value_2 == null ? acc_1 : append(acc_1, singleton(["prefix", string(value(value_2))]))), value_4 == null ? acc_3 : append(acc_3, singleton(["position", int(value(value_4))]))), value_7 == null ? acc_5 : append(acc_5, singleton(["itemSeparator", string(value(value_7))]))), value_9 == null ? acc_7 : append(acc_7, singleton(["separate", yBool(value(value_9))]))));
+  let acc_14, acc_12, acc_10, acc_8, acc_6, acc_4, acc_2, value_1, acc_1, value_4, acc_3, value_6, acc_5, value_9, acc_7, value_11, acc_9, value_14, acc_11, value_16, acc_13;
+  return yMap((acc_14 = (acc_12 = (acc_10 = (acc_8 = (acc_6 = (acc_4 = (acc_2 = (value_1 = ib.LoadContents, acc_1 = empty$1(), value_1 == null ? acc_1 : append(acc_1, singleton(["loadContents", yBool(value(value_1))]))), value_4 = ib.Prefix, acc_3 = acc_2, value_4 == null ? acc_3 : append(acc_3, singleton(["prefix", string(value(value_4))]))), value_6 = ib._position, acc_5 = acc_4, value_6 == null ? acc_5 : append(acc_5, singleton(["position", int(value(value_6))]))), value_9 = ib.ItemSeparator, acc_7 = acc_6, value_9 == null ? acc_7 : append(acc_7, singleton(["itemSeparator", string(value(value_9))]))), value_11 = ib.Separate, acc_9 = acc_8, value_11 == null ? acc_9 : append(acc_9, singleton(["separate", yBool(value(value_11))]))), value_14 = ib.ValueFrom, acc_11 = acc_10, value_14 == null ? acc_11 : append(acc_11, singleton(["valueFrom", string(value(value_14))]))), value_16 = ib.ShellQuote, acc_13 = acc_12, value_16 == null ? acc_13 : append(acc_13, singleton(["shellQuote", yBool(value(value_16))]))), appendDynamicPropertiesExcept(InputBinding.KnownFieldNames, ib, acc_14)));
 }
 function encodeCWLInput(i) {
   let pairs;
+  let acc_20;
+  let acc_18;
+  let acc_16;
+  let acc_14;
+  let acc_12;
+  let acc_10;
+  let acc_8;
+  let acc_6;
   let acc_4;
   let acc_2;
   const value$1 = map((t) => {
@@ -635,7 +824,8 @@ function encodeCWLInput(i) {
                 return encodeCWLType(t);
               case /* Array */
               11: {
-                const matchValue = otherType.fields[0].Items;
+                const arraySchema = otherType.fields[0];
+                const matchValue = arraySchema.Items;
                 switch (matchValue.tag) {
                   case /* File */
                   0:
@@ -703,14 +893,39 @@ function encodeCWLInput(i) {
         return encodeCWLType(t);
     }
   }, i.Type_);
-  const acc_1 = empty();
+  const acc_1 = empty$1();
   acc_2 = value$1 == null ? acc_1 : append(acc_1, singleton(["type", value(value$1)]));
-  const value_2 = i.InputBinding;
+  const value_3 = i.Label;
   const acc_3 = acc_2;
-  acc_4 = value_2 == null ? acc_3 : append(acc_3, singleton(["inputBinding", encodeInputBinding(value(value_2))]));
-  const value_4 = i.Optional;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["label", string(value(value_3))]));
+  const value_5 = i.SecondaryFiles;
   const acc_5 = acc_4;
-  pairs = value_4 == null ? acc_5 : append(acc_5, singleton(["optional", yBool(value(value_4))]));
+  acc_6 = value_5 == null ? acc_5 : append(acc_5, singleton(["secondaryFiles", value(value_5)]));
+  const value_7 = i.Streamable;
+  const acc_7 = acc_6;
+  acc_8 = value_7 == null ? acc_7 : append(acc_7, singleton(["streamable", yBool(value(value_7))]));
+  const value_10 = i.Doc;
+  const acc_9 = acc_8;
+  acc_10 = value_10 == null ? acc_9 : append(acc_9, singleton(["doc", string(value(value_10))]));
+  const value_13 = i.Format;
+  const acc_11 = acc_10;
+  acc_12 = value_13 == null ? acc_11 : append(acc_11, singleton(["format", string(value(value_13))]));
+  const value_15 = i.LoadContents;
+  const acc_13 = acc_12;
+  acc_14 = value_15 == null ? acc_13 : append(acc_13, singleton(["loadContents", yBool(value(value_15))]));
+  let encoder_9;
+  const f1 = LoadListingEnum_get_toCwlString();
+  encoder_9 = (arg) => string(f1(arg));
+  const value_18 = i.LoadListing;
+  const acc_15 = acc_14;
+  acc_16 = value_18 == null ? acc_15 : append(acc_15, singleton(["loadListing", encoder_9(value(value_18))]));
+  const value_20 = i.DefaultValue;
+  const acc_17 = acc_16;
+  acc_18 = value_20 == null ? acc_17 : append(acc_17, singleton(["default", value(value_20)]));
+  const value_22 = i.InputBinding;
+  const acc_19 = acc_18;
+  acc_20 = value_22 == null ? acc_19 : append(acc_19, singleton(["inputBinding", encodeInputBinding(value(value_22))]));
+  pairs = appendDynamicPropertiesExcept(CWLInput.KnownFieldNames, i, acc_20);
   let matchResult_1, t_1;
   if (!isEmpty(pairs)) {
     if (head(pairs)[0] === "type") {
@@ -734,10 +949,11 @@ function encodeCWLInput(i) {
   }
 }
 function encodeSchemaDefRequirementType(s) {
-  return yMap(ofArray([["name", string(s.Name)], ["type", encodeCWLType(s.Type_)]]));
+  let acc;
+  return yMap((acc = ofArray([["name", string(s.Name)], ["type", encodeCWLType(s.Type_)]]), appendDynamicPropertiesExcept(SchemaDefRequirementType.KnownFieldNames, s, acc)));
 }
 function encodeRequirement(r) {
-  let value_23, acc_15, value_20, acc_13, value_17, acc_11, value_14, acc_9, value_11, acc_7, value_8, acc_5, value_5, acc_3, value_2, acc_1;
+  let acc_17, acc_15, acc_13, acc_11, acc_9, acc_7, acc_5, acc_3, value_5, acc_4, value_8, acc_6, value_11, acc_8, value_14, acc_10, value_17, acc_12, value_20, acc_14, value_23, acc_16, acc_24, acc_32, acc_33, acc_34, acc_2, value_2, acc_1;
   switch (r.tag) {
     case /* SchemaDefRequirement */
     1: {
@@ -747,68 +963,39 @@ function encodeRequirement(r) {
     case /* DockerRequirement */
     2: {
       const dr = r.fields[0];
-      return yMap((value_23 = dr.DockerRunOptions, acc_15 = (value_20 = dr.DockerOutputDirectory, acc_13 = (value_17 = dr.DockerImport, acc_11 = (value_14 = dr.DockerLoad, acc_9 = (value_11 = dr.DockerImageId, acc_7 = (value_8 = dr.DockerFile, acc_5 = (value_5 = dr.DockerPull, acc_3 = singleton(["class", string("DockerRequirement")]), value_5 == null ? acc_3 : append(acc_3, singleton(["dockerPull", string(value(value_5))]))), value_8 == null ? acc_5 : append(acc_5, singleton(["dockerFile", encodeSchemaSaladString(value(value_8))]))), value_11 == null ? acc_7 : append(acc_7, singleton(["dockerImageId", string(value(value_11))]))), value_14 == null ? acc_9 : append(acc_9, singleton(["dockerLoad", string(value(value_14))]))), value_17 == null ? acc_11 : append(acc_11, singleton(["dockerImport", string(value(value_17))]))), value_20 == null ? acc_13 : append(acc_13, singleton(["dockerOutputDirectory", string(value(value_20))]))), value_23 == null ? acc_15 : append(acc_15, singleton(["cwltool:dockerRunOptions", YAMLElement_Sequence(ofSeq(map$2(string, value(value_23))))]))));
+      return yMap((acc_17 = (acc_15 = (acc_13 = (acc_11 = (acc_9 = (acc_7 = (acc_5 = (acc_3 = singleton(["class", string("DockerRequirement")]), value_5 = dr.DockerPull, acc_4 = acc_3, value_5 == null ? acc_4 : append(acc_4, singleton(["dockerPull", string(value(value_5))]))), value_8 = dr.DockerFile, acc_6 = acc_5, value_8 == null ? acc_6 : append(acc_6, singleton(["dockerFile", encodeSchemaSaladString(value(value_8))]))), value_11 = dr.DockerImageId, acc_8 = acc_7, value_11 == null ? acc_8 : append(acc_8, singleton(["dockerImageId", string(value(value_11))]))), value_14 = dr.DockerLoad, acc_10 = acc_9, value_14 == null ? acc_10 : append(acc_10, singleton(["dockerLoad", string(value(value_14))]))), value_17 = dr.DockerImport, acc_12 = acc_11, value_17 == null ? acc_12 : append(acc_12, singleton(["dockerImport", string(value(value_17))]))), value_20 = dr.DockerOutputDirectory, acc_14 = acc_13, value_20 == null ? acc_14 : append(acc_14, singleton(["dockerOutputDirectory", string(value(value_20))]))), value_23 = dr.DockerRunOptions, acc_16 = acc_15, value_23 == null ? acc_16 : append(acc_16, singleton(["cwltool:dockerRunOptions", YAMLElement_Sequence(ofSeq(map$2(string, value(value_23))))]))), appendDynamicPropertiesExcept(DockerRequirement.KnownFieldNames, dr, acc_17)));
     }
     case /* SoftwareRequirement */
     3: {
       const pkgs = r.fields[0];
       return yMap(ofArray([["class", string("SoftwareRequirement")], ["packages", YAMLElement_Sequence(ofSeq(map$2((p) => {
-        let value_29, acc_20, value_26, acc_18;
-        return yMap((value_29 = p.Specs, acc_20 = (value_26 = p.Version, acc_18 = append(empty(), singleton(["package", string(p.Package)])), value_26 == null ? acc_18 : append(acc_18, singleton(["version", YAMLElement_Sequence(ofSeq(map$2(string, value(value_26))))]))), value_29 == null ? acc_20 : append(acc_20, singleton(["specs", YAMLElement_Sequence(ofSeq(map$2(string, value(value_29))))]))));
+        let acc_23, acc_21, acc_19, value_26, acc_20, value_29, acc_22;
+        return yMap((acc_23 = (acc_21 = (acc_19 = append(empty$1(), singleton(["package", string(p.Package)])), value_26 = p.Version, acc_20 = acc_19, value_26 == null ? acc_20 : append(acc_20, singleton(["version", YAMLElement_Sequence(ofSeq(map$2(string, value(value_26))))]))), value_29 = p.Specs, acc_22 = acc_21, value_29 == null ? acc_22 : append(acc_22, singleton(["specs", YAMLElement_Sequence(ofSeq(map$2(string, value(value_29))))]))), appendDynamicPropertiesExcept(SoftwarePackage.KnownFieldNames, p, acc_23)));
       }, pkgs)))]]));
     }
     case /* LoadListingRequirement */
     4: {
       const loadListing = r.fields[0];
-      return yMap(ofArray([["class", string("LoadListingRequirement")], ["loadListing", string(LoadListingEnum_get_toCwlString()(loadListing.LoadListing))]]));
+      return yMap((acc_24 = ofArray([["class", string("LoadListingRequirement")], ["loadListing", string(LoadListingEnum_get_toCwlString()(loadListing.LoadListing))]]), appendDynamicPropertiesExcept(LoadListingRequirementValue.KnownFieldNames, loadListing, acc_24)));
     }
     case /* InitialWorkDirRequirement */
     5: {
       const listing = r.fields[0];
-      const encodeDynamicObjWithClass = (className, dynObj) => {
-        const dynamicPairs = toList(choose$1((kvp) => {
-          const matchValue = kvp[1];
-          if (typeof matchValue === "string") {
-            return [kvp[0], string(matchValue)];
-          } else if (typeof matchValue === "boolean") {
-            return [kvp[0], yBool(matchValue)];
-          } else if (typeof matchValue === "number") {
-            return [kvp[0], int(matchValue)];
-          } else if (typeof matchValue === "bigint") {
-            return [kvp[0], string(int64ToString(matchValue))];
-          } else if (typeof matchValue === "number") {
-            return [kvp[0], float(matchValue)];
-          } else if (matchValue instanceof YAMLElement) {
-            return [kvp[0], matchValue];
-          } else {
-            return void 0;
-          }
-        }, dynObj.GetProperties(false)));
-        if (exists((tupledArg) => tupledArg[0] === "class", dynamicPairs)) {
-          return yMap(dynamicPairs);
-        } else {
-          return yMap(cons(["class", string(className)], dynamicPairs));
-        }
-      };
-      return yMap(ofArray([["class", string("InitialWorkDirRequirement")], ["listing", YAMLElement_Sequence(ofSeq(map$2((_arg_1) => {
-        let value_34, acc_25, value_32, acc_22;
-        switch (_arg_1.tag) {
+      return yMap(ofArray([["class", string("InitialWorkDirRequirement")], ["listing", YAMLElement_Sequence(ofSeq(map$2((_arg) => {
+        let acc_30, acc_28, value_32, acc_26, value_34, acc_29;
+        switch (_arg.tag) {
           case /* StringEntry */
           1:
-            return encodeSchemaSaladString(_arg_1.fields[0]);
+            return encodeSchemaSaladString(_arg.fields[0]);
           case /* FileEntry */
-          2: {
-            const arg_1 = _arg_1.fields[0];
-            return encodeDynamicObjWithClass("File", arg_1);
-          }
+          2:
+            return yMap(encodeFilePairs("class", "File", _arg.fields[0]));
           case /* DirectoryEntry */
-          3: {
-            const arg_3 = _arg_1.fields[0];
-            return encodeDynamicObjWithClass("Directory", arg_3);
-          }
+          3:
+            return yMap(encodeDirectoryPairs("class", "Directory", _arg.fields[0]));
           default: {
-            const d = _arg_1.fields[0];
-            return yMap((value_34 = d.Writable, acc_25 = append((value_32 = d.Entryname, acc_22 = empty(), value_32 == null ? acc_22 : append(acc_22, singleton(["entryname", encodeSchemaSaladString(value(value_32))]))), singleton(["entry", encodeSchemaSaladString(d.Entry)])), value_34 == null ? acc_25 : append(acc_25, singleton(["writable", yBool(value(value_34))]))));
+            const d = _arg.fields[0];
+            return yMap((acc_30 = (acc_28 = append((value_32 = d.Entryname, acc_26 = empty$1(), value_32 == null ? acc_26 : append(acc_26, singleton(["entryname", encodeSchemaSaladString(value(value_32))]))), singleton(["entry", encodeSchemaSaladString(d.Entry)])), value_34 = d.Writable, acc_29 = acc_28, value_34 == null ? acc_29 : append(acc_29, singleton(["writable", yBool(value(value_34))]))), appendDynamicPropertiesExcept(DirentInstance.KnownFieldNames, d, acc_30)));
           }
         }
       }, listing)))]]));
@@ -817,8 +1004,9 @@ function encodeRequirement(r) {
     6: {
       const envs = r.fields[0];
       return yMap(ofArray([["class", string("EnvVarRequirement")], ["envDef", YAMLElement_Sequence(ofSeq(map$2((e) => {
+        let acc_31;
         const v_12 = normalizeEnvValueForEncode(e.EnvValue);
-        return yMap(ofArray([["envName", string(e.EnvName)], ["envValue", string(v_12)]]));
+        return yMap((acc_31 = ofArray([["envName", string(e.EnvName)], ["envValue", string(v_12)]]), appendDynamicPropertiesExcept(EnvironmentDef.KnownFieldNames, e, acc_31)));
       }, envs)))]]));
     }
     case /* ShellCommandRequirement */
@@ -829,11 +1017,11 @@ function encodeRequirement(r) {
       const rr = r.fields[0];
       const tryEncodeScalar = (key, value_35) => {
         if (typeof value_35 === "number") {
+          return [key, yFloat(value_35)];
+        } else if (typeof value_35 === "number") {
           return [key, int(value_35)];
         } else if (typeof value_35 === "bigint") {
           return [key, YAMLElement_Value(YAMLContent_create_Z1C3A29C9(int64ToString(value_35)))];
-        } else if (typeof value_35 === "number") {
-          return [key, float(value_35)];
         } else if (typeof value_35 === "string") {
           return [key, string(value_35)];
         } else if (typeof value_35 === "boolean") {
@@ -842,16 +1030,19 @@ function encodeRequirement(r) {
           return void 0;
         }
       };
-      const dynamicPairs_1 = toList(choose$1((kvp_1) => {
-        const matchValue_1 = kvp_1[1];
-        return tryEncodeScalar(kvp_1[0], matchValue_1);
-      }, rr.GetProperties(false)));
-      return yMap(append(singleton(["class", string("ResourceRequirement")]), dynamicPairs_1));
+      const knownPairs = choose$1((tupledArg) => bind(curry2(tryEncodeScalar)(tupledArg[0]), tupledArg[1]), rr.KnownFieldValues);
+      const dynamicPairs = toList(choose((kvp) => {
+        const matchValue = kvp[1];
+        return tryEncodeScalar(kvp[0], matchValue);
+      }, dynamicPropertiesExcept(ofSeq$1(map$2((x) => x, ResourceRequirementInstance.KnownFieldNames), {
+        Compare: comparePrimitives
+      }), rr)));
+      return yMap(append(singleton(["class", string("ResourceRequirement")]), append(knownPairs, dynamicPairs)));
     }
     case /* WorkReuseRequirement */
     9: {
       const workReuse = r.fields[0];
-      return yMap(ofArray([["class", string("WorkReuse")], ["enableReuse", yBool(workReuse.EnableReuse)]]));
+      return yMap((acc_32 = ofArray([["class", string("WorkReuse")], ["enableReuse", yBool(workReuse.EnableReuse)]]), appendDynamicPropertiesExcept(WorkReuseRequirementValue.KnownFieldNames, workReuse, acc_32)));
     }
     case /* WorkReuseExpressionRequirement */
     10: {
@@ -861,7 +1052,7 @@ function encodeRequirement(r) {
     case /* NetworkAccessRequirement */
     11: {
       const networkAccess = r.fields[0];
-      return yMap(ofArray([["class", string("NetworkAccess")], ["networkAccess", yBool(networkAccess.NetworkAccess)]]));
+      return yMap((acc_33 = ofArray([["class", string("NetworkAccess")], ["networkAccess", yBool(networkAccess.NetworkAccess)]]), appendDynamicPropertiesExcept(NetworkAccessRequirementValue.KnownFieldNames, networkAccess, acc_33)));
     }
     case /* NetworkAccessExpressionRequirement */
     12: {
@@ -871,7 +1062,7 @@ function encodeRequirement(r) {
     case /* InplaceUpdateRequirement */
     13: {
       const inplaceUpdate = r.fields[0];
-      return yMap(ofArray([["class", string("InplaceUpdateRequirement")], ["inplaceUpdate", yBool(inplaceUpdate.InplaceUpdate)]]));
+      return yMap((acc_34 = ofArray([["class", string("InplaceUpdateRequirement")], ["inplaceUpdate", yBool(inplaceUpdate.InplaceUpdate)]]), appendDynamicPropertiesExcept(InplaceUpdateRequirementValue.KnownFieldNames, inplaceUpdate, acc_34)));
     }
     case /* ToolTimeLimitRequirement */
     14: {
@@ -892,20 +1083,23 @@ function encodeRequirement(r) {
     case /* StepInputExpressionRequirement */
     18:
       return yMap(singleton(["class", string("StepInputExpressionRequirement")]));
-    default:
-      return yMap((value_2 = bind((entries) => {
+    default: {
+      const value$1 = r.fields[0];
+      return yMap((acc_2 = (value_2 = bind((entries) => {
         if (entries.length > 0) {
           return entries;
         } else {
           return void 0;
         }
-      }, r.fields[0].ExpressionLib), acc_1 = singleton(["class", string("InlineJavascriptRequirement")]), value_2 == null ? acc_1 : append(acc_1, singleton(["expressionLib", YAMLElement_Sequence(ofSeq(map$2(string, value(value_2))))]))));
+      }, value$1.ExpressionLib), acc_1 = singleton(["class", string("InlineJavascriptRequirement")]), value_2 == null ? acc_1 : append(acc_1, singleton(["expressionLib", YAMLElement_Sequence(ofSeq(map$2(string, value(value_2))))]))), appendDynamicPropertiesExcept(InlineJavascriptRequirementValue.KnownFieldNames, value$1, acc_2)));
+    }
   }
 }
 function encodeHintEntry(hint) {
   if (hint.tag === /* UnknownHint */
   1) {
-    return hint.fields[0].Raw;
+    const unknownHint = hint.fields[0];
+    return unknownHint.Raw;
   } else {
     return encodeRequirement(hint.fields[0]);
   }
@@ -928,33 +1122,43 @@ function encodeScatterMethod(scatterMethod) {
 }
 function encodeStepInput(si) {
   let pairs;
-  const value_21 = si.Label;
-  let acc_17;
-  const value_18 = si.LoadListing;
-  let acc_15;
-  const value_15 = si.LoadContents;
-  let acc_13;
-  const value_13 = si.Doc;
-  let acc_11;
-  const value_10 = si.PickValue;
-  let acc_9;
-  const value_8 = si.LinkMerge;
-  let acc_7;
-  const value_6 = si.ValueFrom;
-  let acc_5;
-  const value_3 = si.DefaultValue;
-  let acc_3;
+  let acc_18;
+  let acc_16;
+  let acc_14;
+  let acc_12;
+  let acc_10;
+  let acc_8;
+  let acc_6;
+  let acc_4;
+  let acc_2;
   const value_1 = si.Source;
-  const acc_1 = empty();
-  acc_3 = value_1 == null ? acc_1 : append(acc_1, singleton(["source", encodeSourceArray(value(value_1))]));
-  acc_5 = value_3 == null ? acc_3 : append(acc_3, singleton(["default", value(value_3)]));
-  acc_7 = value_6 == null ? acc_5 : append(acc_5, singleton(["valueFrom", string(value(value_6))]));
-  acc_9 = value_8 == null ? acc_7 : append(acc_7, singleton(["linkMerge", encodeLinkMergeMethod(value(value_8))]));
-  acc_11 = value_10 == null ? acc_9 : append(acc_9, singleton(["pickValue", encodePickValueMethod(value(value_10))]));
-  acc_13 = value_13 == null ? acc_11 : append(acc_11, singleton(["doc", string(value(value_13))]));
-  acc_15 = value_15 == null ? acc_13 : append(acc_13, singleton(["loadContents", yBool(value(value_15))]));
-  acc_17 = value_18 == null ? acc_15 : append(acc_15, singleton(["loadListing", string(value(value_18))]));
-  pairs = value_21 == null ? acc_17 : append(acc_17, singleton(["label", string(value(value_21))]));
+  const acc_1 = empty$1();
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["source", encodeSourceArray(value(value_1))]));
+  const value_3 = si.DefaultValue;
+  const acc_3 = acc_2;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["default", value(value_3)]));
+  const value_6 = si.ValueFrom;
+  const acc_5 = acc_4;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["valueFrom", string(value(value_6))]));
+  const value_8 = si.LinkMerge;
+  const acc_7 = acc_6;
+  acc_8 = value_8 == null ? acc_7 : append(acc_7, singleton(["linkMerge", encodeLinkMergeMethod(value(value_8))]));
+  const value_10 = si.PickValue;
+  const acc_9 = acc_8;
+  acc_10 = value_10 == null ? acc_9 : append(acc_9, singleton(["pickValue", encodePickValueMethod(value(value_10))]));
+  const value_13 = si.Doc;
+  const acc_11 = acc_10;
+  acc_12 = value_13 == null ? acc_11 : append(acc_11, singleton(["doc", string(value(value_13))]));
+  const value_15 = si.LoadContents;
+  const acc_13 = acc_12;
+  acc_14 = value_15 == null ? acc_13 : append(acc_13, singleton(["loadContents", yBool(value(value_15))]));
+  const value_18 = si.LoadListing;
+  const acc_15 = acc_14;
+  acc_16 = value_18 == null ? acc_15 : append(acc_15, singleton(["loadListing", string(value(value_18))]));
+  const value_21 = si.Label;
+  const acc_17 = acc_16;
+  acc_18 = value_21 == null ? acc_17 : append(acc_17, singleton(["label", string(value(value_21))]));
+  pairs = appendDynamicPropertiesExcept(StepInput.KnownFieldNames, si, acc_18);
   let matchResult, s_1;
   if (!isEmpty(pairs)) {
     if (head(pairs)[0] === "source") {
@@ -985,7 +1189,8 @@ function encodeStepInputs(inputs) {
   return yMap(toList(map$2(encodeStepInput, inputs)));
 }
 function encodeStepOutputParameter(so) {
-  return yMap(singleton(["id", string(so.Id)]));
+  let acc;
+  return yMap((acc = singleton(["id", string(so.Id)]), appendDynamicPropertiesExcept(StepOutputParameter.KnownFieldNames, so, acc)));
 }
 function encodeStepOutputs(outputs) {
   return YAMLElement_Sequence(ofSeq(map$2((output) => {
@@ -1051,7 +1256,7 @@ function encodeWorkflowStepRun(run) {
   }
 }
 function encodeToolDescriptionElement(td) {
-  let h, r, bc, matchValue_3, i, i_1, matchValue_4, md;
+  let h, r, bc, matchValue_3, i, i_1;
   let basePairs;
   let acc_6;
   let acc_4;
@@ -1132,14 +1337,42 @@ function encodeToolDescriptionElement(td) {
     default:
       withBaseCommand = withRequirements;
   }
-  const withOutputs = append((matchValue_3 = td.Inputs, matchValue_3 != null ? (i = value(matchValue_3), i.length > 0) ? (i_1 = value(matchValue_3), append(withBaseCommand, singleton(["inputs", yMap(toList(map$2(encodeCWLInput, i_1)))]))) : withBaseCommand : withBaseCommand), singleton(["outputs", yMap(toList(map$2(encodeCWLOutput, td.Outputs)))]));
-  return yMap((matchValue_4 = td.Metadata, matchValue_4 == null ? withOutputs : (md = value(matchValue_4), fold((acc_8, kvp) => {
-    let matchValue_5;
-    return append(acc_8, singleton([kvp[0], (matchValue_5 = kvp[1], typeof matchValue_5 === "string" ? string(matchValue_5) : typeof matchValue_5 === "boolean" ? yBool(matchValue_5) : typeof matchValue_5 === "number" ? int(matchValue_5) : typeof matchValue_5 === "number" ? float(matchValue_5) : matchValue_5 instanceof YAMLElement ? matchValue_5 : string(toString(kvp[1])))]));
-  }, withOutputs, md.GetProperties(false)))));
+  let withCommandFields;
+  let acc_20;
+  let acc_18;
+  let acc_16;
+  let acc_14;
+  let acc_12;
+  let acc_10;
+  const value_2 = td.Arguments;
+  const acc_9 = withBaseCommand;
+  acc_10 = value_2 == null ? acc_9 : append(acc_9, singleton(["arguments", value(value_2)]));
+  const value_5 = td.Stdin;
+  const acc_11 = acc_10;
+  acc_12 = value_5 == null ? acc_11 : append(acc_11, singleton(["stdin", string(value(value_5))]));
+  const value_8 = td.Stderr;
+  const acc_13 = acc_12;
+  acc_14 = value_8 == null ? acc_13 : append(acc_13, singleton(["stderr", string(value(value_8))]));
+  const value_11 = td.Stdout;
+  const acc_15 = acc_14;
+  acc_16 = value_11 == null ? acc_15 : append(acc_15, singleton(["stdout", string(value(value_11))]));
+  const value_14 = td.SuccessCodes;
+  const acc_17 = acc_16;
+  acc_18 = value_14 == null ? acc_17 : append(acc_17, singleton(["successCodes", YAMLElement_Sequence(ofSeq(map$2(int, value(value_14))))]));
+  const value_17 = td.TemporaryFailCodes;
+  const acc_19 = acc_18;
+  acc_20 = value_17 == null ? acc_19 : append(acc_19, singleton(["temporaryFailCodes", YAMLElement_Sequence(ofSeq(map$2(int, value(value_17))))]));
+  const value_20 = td.PermanentFailCodes;
+  const acc_21 = acc_20;
+  withCommandFields = value_20 == null ? acc_21 : append(acc_21, singleton(["permanentFailCodes", YAMLElement_Sequence(ofSeq(map$2(int, value(value_20))))]));
+  const withOutputs = append((matchValue_3 = td.Inputs, matchValue_3 != null ? (i = value(matchValue_3), i.length > 0) ? (i_1 = value(matchValue_3), append(withCommandFields, singleton(["inputs", yMap(toList(map$2(encodeCWLInput, i_1)))]))) : withCommandFields : withCommandFields), singleton(["outputs", yMap(toList(map$2(encodeCWLOutput, td.Outputs)))]));
+  let withMetadata;
+  const matchValue_4 = td.Metadata;
+  withMetadata = matchValue_4 == null ? withOutputs : appendDynamicProperties(value(matchValue_4), withOutputs);
+  return yMap(appendDynamicPropertiesExcept(CWLToolDescription.KnownFieldNames, td, withMetadata));
 }
 function encodeExpressionToolDescriptionElement(et) {
-  let h, r, matchValue_2, i, i_1, matchValue_3, md;
+  let h, r, matchValue_2, i, i_1;
   let basePairs;
   let acc_6;
   let acc_4;
@@ -1200,13 +1433,13 @@ function encodeExpressionToolDescriptionElement(et) {
       withRequirements = withHints;
   }
   const withExpression = append(append((matchValue_2 = et.Inputs, matchValue_2 != null ? (i = value(matchValue_2), i.length > 0) ? (i_1 = value(matchValue_2), append(withRequirements, singleton(["inputs", yMap(toList(map$2(encodeCWLInput, i_1)))]))) : withRequirements : withRequirements), singleton(["outputs", yMap(toList(map$2(encodeCWLOutput, et.Outputs)))])), singleton(["expression", encodeExpressionScalar(et.Expression)]));
-  return yMap((matchValue_3 = et.Metadata, matchValue_3 == null ? withExpression : (md = value(matchValue_3), fold((acc_8, kvp) => {
-    let matchValue_4;
-    return append(acc_8, singleton([kvp[0], (matchValue_4 = kvp[1], typeof matchValue_4 === "string" ? string(matchValue_4) : typeof matchValue_4 === "boolean" ? yBool(matchValue_4) : typeof matchValue_4 === "number" ? int(matchValue_4) : typeof matchValue_4 === "number" ? float(matchValue_4) : matchValue_4 instanceof YAMLElement ? matchValue_4 : string(toString(kvp[1])))]));
-  }, withExpression, md.GetProperties(false)))));
+  let withMetadata;
+  const matchValue_3 = et.Metadata;
+  withMetadata = matchValue_3 == null ? withExpression : appendDynamicProperties(value(matchValue_3), withExpression);
+  return yMap(appendDynamicPropertiesExcept(CWLExpressionToolDescription.KnownFieldNames, et, withMetadata));
 }
 function encodeOperationDescriptionElement(op) {
-  let h, matchValue_1, r, r_1, matchValue_2, md;
+  let h, matchValue_1, r, r_1;
   let basePairs;
   let acc_6;
   let acc_4;
@@ -1246,13 +1479,13 @@ function encodeOperationDescriptionElement(op) {
       withHints = basePairs;
   }
   const withOutputs = append(append((matchValue_1 = op.Requirements, matchValue_1 != null ? (r = value(matchValue_1), r.length > 0) ? (r_1 = value(matchValue_1), append(withHints, singleton(["requirements", YAMLElement_Sequence(ofSeq(map$2(encodeRequirement, r_1)))]))) : withHints : withHints), singleton(["inputs", yMap(toList(map$2(encodeCWLInput, op.Inputs)))])), singleton(["outputs", yMap(toList(map$2(encodeCWLOutput, op.Outputs)))]));
-  return yMap((matchValue_2 = op.Metadata, matchValue_2 == null ? withOutputs : (md = value(matchValue_2), fold((acc_8, kvp) => {
-    let matchValue_3;
-    return append(acc_8, singleton([kvp[0], (matchValue_3 = kvp[1], typeof matchValue_3 === "string" ? string(matchValue_3) : typeof matchValue_3 === "boolean" ? yBool(matchValue_3) : typeof matchValue_3 === "number" ? int(matchValue_3) : typeof matchValue_3 === "number" ? float(matchValue_3) : matchValue_3 instanceof YAMLElement ? matchValue_3 : string(toString(kvp[1])))]));
-  }, withOutputs, md.GetProperties(false)))));
+  let withMetadata;
+  const matchValue_2 = op.Metadata;
+  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(value(matchValue_2), withOutputs);
+  return yMap(appendDynamicPropertiesExcept(CWLOperationDescription.KnownFieldNames, op, withMetadata));
 }
 function encodeWorkflowDescriptionElement(wd) {
-  let h, matchValue_1, r, r_1, matchValue_2, md;
+  let h, matchValue_1, r, r_1;
   let basePairs;
   let acc_6;
   let acc_4;
@@ -1292,14 +1525,15 @@ function encodeWorkflowDescriptionElement(wd) {
       withHints = basePairs;
   }
   const withOutputs = append(append(append((matchValue_1 = wd.Requirements, matchValue_1 != null ? (r = value(matchValue_1), r.length > 0) ? (r_1 = value(matchValue_1), append(withHints, singleton(["requirements", YAMLElement_Sequence(ofSeq(map$2(encodeRequirement, r_1)))]))) : withHints : withHints), singleton(["inputs", yMap(toList(map$2(encodeCWLInput, wd.Inputs)))])), singleton(["steps", yMap(toList(map$2(encodeWorkflowStep, wd.Steps)))])), singleton(["outputs", yMap(toList(map$2(encodeCWLOutput, wd.Outputs)))]));
-  return yMap((matchValue_2 = wd.Metadata, matchValue_2 == null ? withOutputs : (md = value(matchValue_2), fold((acc_8, kvp) => {
-    let matchValue_3;
-    return append(acc_8, singleton([kvp[0], (matchValue_3 = kvp[1], typeof matchValue_3 === "string" ? string(matchValue_3) : typeof matchValue_3 === "boolean" ? yBool(matchValue_3) : typeof matchValue_3 === "number" ? int(matchValue_3) : typeof matchValue_3 === "number" ? float(matchValue_3) : matchValue_3 instanceof YAMLElement ? matchValue_3 : string(toString(kvp[1])))]));
-  }, withOutputs, md.GetProperties(false)))));
+  let withMetadata;
+  const matchValue_2 = wd.Metadata;
+  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(value(matchValue_2), withOutputs);
+  return yMap(appendDynamicPropertiesExcept(CWLWorkflowDescription.KnownFieldNames, wd, withMetadata));
 }
 function encodeWorkflowStep(ws) {
   let h, r;
   let basePairs;
+  let acc_10;
   let acc_8;
   let acc_6;
   let acc_4;
@@ -1319,7 +1553,8 @@ function encodeWorkflowStep(ws) {
   acc_8 = value_9 == null ? acc_7 : append(acc_7, singleton(["scatterMethod", encodeScatterMethod(value(value_9))]));
   const value_12 = ws.When_;
   const acc_9 = acc_8;
-  basePairs = value_12 == null ? acc_9 : append(acc_9, singleton(["when", string(value(value_12))]));
+  acc_10 = value_12 == null ? acc_9 : append(acc_9, singleton(["when", string(value(value_12))]));
+  basePairs = appendDynamicPropertiesExcept(WorkflowStep.KnownFieldNames, ws, acc_10);
   let withHints;
   const matchValue = ws.Hints;
   let matchResult, h_1;
@@ -1370,7 +1605,7 @@ function writeYaml(element) {
 function getObjectPairs(element) {
   if (element.tag === /* Object */
   3) {
-    return choose((_arg) => {
+    return choose$1((_arg) => {
       if (_arg.tag === /* Mapping */
       0) {
         return [_arg.fields[0].Value, _arg.fields[1]];
@@ -1379,7 +1614,7 @@ function getObjectPairs(element) {
       }
     }, element.fields[0]);
   } else {
-    return empty();
+    return empty$1();
   }
 }
 function renderTopLevelElement(baseKeys, orderedSectionKeys, element) {
@@ -1389,7 +1624,7 @@ function renderTopLevelElement(baseKeys, orderedSectionKeys, element) {
     Equals: (x, y) => x === y,
     GetHashCode: stringHash
   }), pairs_2);
-  const knownSections = choose((sectionKey) => map(singleton, tryFind((tupledArg_1) => tupledArg_1[0] === sectionKey, pairs_2)), orderedSectionKeys);
+  const knownSections = choose$1((sectionKey) => map(singleton, tryFind((tupledArg_1) => tupledArg_1[0] === sectionKey, pairs_2)), orderedSectionKeys);
   const reservedKeys = ofList(append(baseKeys, orderedSectionKeys), {
     Compare: comparePrimitives
   });
@@ -1434,7 +1669,7 @@ function renderTopLevelElement(baseKeys, orderedSectionKeys, element) {
         break;
       }
   };
-  return join("\r\n", merge(empty(), ofArray(split(join("\r\n\r\n", toList(delay(() => append$1(length(basePairs) > 0 ? singleton$1(section(basePairs)) : empty$1(), delay(() => append$1(map$1(section, knownSections), delay(() => length(metadataPairs) > 0 ? singleton$1(section(metadataPairs)) : empty$1()))))))), ["\r\n"], void 0, 0))));
+  return join("\r\n", merge(empty$1(), ofArray(split(join("\r\n\r\n", toList(delay(() => append$1(length(basePairs) > 0 ? singleton$1(section(basePairs)) : empty$2(), delay(() => append$1(map$1(section, knownSections), delay(() => length(metadataPairs) > 0 ? singleton$1(section(metadataPairs)) : empty$2()))))))), ["\r\n"], void 0, 0))));
 }
 function encodeToolDescription(td) {
   return renderTopLevelElement(ofArray(["cwlVersion", "class", "id", "label", "doc", "intent"]), ofArray(["hints", "requirements", "baseCommand", "inputs", "outputs"]), encodeToolDescriptionElement(td));
@@ -1487,7 +1722,8 @@ function encodeCWLTypeYaml(t) {
   }
 }
 function encodeInputRecordFieldYaml(field) {
-  return `{name: ${field.Name}, type: ${encodeCWLTypeYaml(field.Type)}}`;
+  const typeYaml = encodeCWLTypeYaml(field.Type);
+  return `{name: ${field.Name}, type: ${typeYaml}}`;
 }
 function encodeInputRecordSchemaYaml(schema) {
   let fs;
@@ -1528,4 +1764,4 @@ function cwlTypeToYamlString(t) {
   return encodeCWLTypeYaml(t);
 }
 
-export { $007CPrimitiveType$007CComplexType$007C, cwlTypeToYamlString, encodeCWLInput, encodeCWLOutput, encodeCWLType, encodeCWLTypeYaml, encodeDoc, encodeEnvVarRequirementCompactMap, encodeExpressionScalar, encodeExpressionToolDescription, encodeExpressionToolDescriptionElement, encodeHintEntry, encodeInputArraySchema, encodeInputArraySchemaYaml, encodeInputBinding, encodeInputEnumSchema, encodeInputEnumSchemaYaml, encodeInputRecordField, encodeInputRecordFieldYaml, encodeInputRecordSchema, encodeInputRecordSchemaYaml, encodeIntent, encodeLabel, encodeLinkMergeMethod, encodeOperationDescription, encodeOperationDescriptionElement, encodeOutputBinding, encodePickValueMethod, encodeProcessingUnit, encodeRequirement, encodeScatter, encodeScatterMethod, encodeSchemaDefRequirementType, encodeSchemaSaladString, encodeSoftwareRequirementCompactMap, encodeSourceArray, encodeStepInput, encodeStepInputs, encodeStepOutputParameter, encodeStepOutputs, encodeStringArrayOrScalar, encodeToolDescription, encodeToolDescriptionElement, encodeWorkflowDescription, encodeWorkflowDescriptionElement, encodeWorkflowStep, encodeWorkflowStepRun, getObjectPairs, isComplexType, normalizeDocString, normalizeEnvValueForEncode, renderTopLevelElement, tryGetArrayShorthand, writeYaml, yBool, yMap };
+export { $007CPrimitiveType$007CComplexType$007C, appendDynamicProperties, appendDynamicPropertiesExcept, cwlTypeToYamlString, encodeCWLInput, encodeCWLOutput, encodeCWLType, encodeCWLTypeYaml, encodeDirectoryPairs, encodeDoc, encodeDynamicObj, encodeDynamicValue, encodeEnvVarRequirementCompactMap, encodeExpressionScalar, encodeExpressionToolDescription, encodeExpressionToolDescriptionElement, encodeFilePairs, encodeHintEntry, encodeInputArraySchema, encodeInputArraySchemaYaml, encodeInputBinding, encodeInputEnumSchema, encodeInputEnumSchemaYaml, encodeInputRecordField, encodeInputRecordFieldYaml, encodeInputRecordSchema, encodeInputRecordSchemaYaml, encodeIntent, encodeLabel, encodeLinkMergeMethod, encodeOperationDescription, encodeOperationDescriptionElement, encodeOutputBinding, encodePickValueMethod, encodeProcessingUnit, encodeRequirement, encodeScatter, encodeScatterMethod, encodeSchemaDefRequirementType, encodeSchemaSaladString, encodeSoftwareRequirementCompactMap, encodeSourceArray, encodeStepInput, encodeStepInputs, encodeStepOutputParameter, encodeStepOutputs, encodeStringArrayOrScalar, encodeToolDescription, encodeToolDescriptionElement, encodeWorkflowDescription, encodeWorkflowDescriptionElement, encodeWorkflowStep, encodeWorkflowStepRun, getObjectPairs, isComplexType, normalizeDocString, normalizeEnvValueForEncode, renderTopLevelElement, tryGetArrayShorthand, writeYaml, yBool, yFloat, yMap };