@nfdi4plants/arctrl 3.2.3 → 3.3.0

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

@@ -1,72 +1,126 @@
+import { toList, isEmpty as isEmpty$1, choose, fold, map as map$1, toArray as toArray$1, delay, append as append$1, singleton as singleton$1, empty as empty$2, collect } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { InputArraySchema, RawYaml, ListEntry$1, FileInstance, DirectoryInstance, CWLType_Array$, CWLType, InputRecordField, InputRecordSchema, InputEnumSchema, SchemaSaladString, DirentInstance, SoftwarePackage } from './CWLTypes.js';
+import { isEmpty, head, tail, map, empty, forAll, singleton, cons, length, append, choose as choose$1, ofSeq, ofArray, partition, exists, mapIndexed, reverse, skipWhile, filter, contains, tryFind, toArray as toArray$2, last, take, concat } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { toArray, value, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { FSharpChoice$2_Choice1Of2, FSharpChoice$2_Choice2Of2 } from '../../node_modules/@fable-org/fable-library-ts/Choice.js';
-import { FileInstance, DirectoryInstance, DirentInstance, InputRecordField, InputRecordSchema, InputEnumSchema, InputArraySchema, SchemaDefRequirementType, SoftwarePackage } from './CWLTypes.js';
-import { value, defaultArg, toArray } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { toList, choose, fold, map as map$1, delay, append as append$1, singleton as singleton$1, empty as empty$2 } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
-import { isEmpty, head, tail, map, append, singleton, ofArray, empty as empty$1, ofSeq, length, choose as choose$1, filter, contains as contains$1, tryFind, reverse, cons } from '../../node_modules/@fable-org/fable-library-ts/List.js';
-import { YAMLElement_Value, YAMLContent_create_Z1C3A29C9, YAMLElement_Object$, YAMLElement_Mapping, YAMLElement, YAMLElement_Sequence, ScalarStyle_Block, BlockScalarStyle, ChompingMode, ScalarStyle, Config } from '../fable_modules/YAMLicious.1.0.0/YAMLiciousTypes.fs.js';
-import { equals, defaultOf, int64ToString, isIterable, comparePrimitives, curry2, stringHash } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { string, int } from '../fable_modules/YAMLicious.1.0.0/Encode.fs.js';
-import { DynamicObj } from '../fable_modules/DynamicObj.8.0.0/DynamicObj.fs.js';
 import { dynamicPropertiesExcept } from './DynamicObjHelpers.js';
-import { empty, ofSeq as ofSeq$1, contains, ofList, FSharpSet__Contains } from '../../node_modules/@fable-org/fable-library-ts/Set.js';
-import { trimEnd, replace, interpolate, trimStart, join, split, concat } from '../../node_modules/@fable-org/fable-library-ts/String.js';
-import { Operators_IsNull } from '../../node_modules/@fable-org/fable-library-ts/FSharp.Core.js';
-import { LoadListingEnum_get_toCwlString, InlineJavascriptRequirementValue, InplaceUpdateRequirementValue, NetworkAccessRequirementValue, WorkReuseRequirementValue, ResourceRequirementInstance, EnvironmentDef, LoadListingRequirementValue, DockerRequirement } from './Requirements.js';
+import { YamlNodeModule_scalar, YamlNodeModule_withScalarValue, YamlNodeModule_item, YamlNodeModule_isMissingValue, YamlNodeModule_flowSequence, YamlNodeModule_sequence, YamlNodeModule_flowMapping, YamlNodeModule_entry, YamlNodeModule_mapping } from '../fable_modules/YAMLicious.2.0.0/Node.fs.js';
+import { ScalarStyle_Block, BlockScalarStyle, ChompingMode, ScalarStyle, CollectionStyle, Separation_NewLine, LineBreak, SequenceItem, YamlNode, YamlNodeKind_Mapping, Collection$1, MappingEntry, YamlNode_$reflection, Trivia_$reflection, YamlNodeKind_Sequence, Trivia_BlankLine } from '../fable_modules/YAMLicious.2.0.0/Model.fs.js';
+import { holdsLineBreakCharacter, textNode, normalizeTree, keepAsText } from './ScalarQuoting.js';
+import { join, replace, interpolate } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { equals, stringHash, defaultOf, isIterable, comparePrimitives, curry2 } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { Encode_object, Encode_bool, Encode_float, Encode_int, Encode_int64, Encode_string, Encode_nullValue } from '../fable_modules/YAMLicious.2.0.0/Encode.fs.js';
+import { Decode_entryName } from './Decode.js';
+import { List_distinct } from '../../node_modules/@fable-org/fable-library-ts/Seq2.js';
+import { DynamicObj } from '../fable_modules/DynamicObj.8.0.0/DynamicObj.fs.js';
+import { empty as empty$1, FSharpSet__Contains, ofSeq as ofSeq$1, ofList } from '../../node_modules/@fable-org/fable-library-ts/Set.js';
+import { LoadListingEnum, InlineJavascriptRequirementValue, InplaceUpdateRequirementValue, NetworkAccessRequirementValue, WorkReuseRequirementValue, ResourceRequirementInstance, EnvironmentDef, FileOrDirectory_DirectoryItem, FileOrDirectory_FileItem, LoadListingRequirementValue, DockerRequirement } from './Requirements.js';
 import { OutputBinding, CWLOutput } from './Outputs.js';
-import { item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
-import { CWLParameterValueModule_floatToRoundTripString, CWLParameterValueModule_tryInferType } from './ParameterValue.js';
 import { InputBinding, CWLInput } from './Inputs.js';
 import { StepInput, StepOutputParameter, WorkflowStep } from './WorkflowSteps.js';
+import { item, iterateIndexed, copy, mapIndexed as mapIndexed$1 } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { WorkflowStepRunOps_tryGetOperation, WorkflowStepRunOps_tryGetExpressionTool, WorkflowStepRunOps_tryGetWorkflow, WorkflowStepRunOps_tryGetTool } from './CWLProcessingUnit.js';
 import { CWLToolDescription } from './ToolDescription.js';
 import { ArgumentException_$ctor_Z721C83C5 } from '../../node_modules/@fable-org/fable-library-ts/System.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/Writer.fs.js';
-import { CWLParameterReference } from './ParameterReference.js';
+import { Record } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { record_type, bool_type, array_type, int32_type, list_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
+import { WriterOptionsModule_defaults, Writer_writeNode, Writer_endsWithKeptLines } from '../fable_modules/YAMLicious.2.0.0/Writer.fs.js';
 
+function $007COptionalOf$007C_$007C(t) {
+  if (t.tag === /* Union */
+  21) {
+    const matchValue = toList(t.fields[0]);
+    let matchResult = void 0, otherType = void 0;
+    if (!isEmpty(matchValue)) {
+      if (head(matchValue).tag === /* Null */
+      17) {
+        if (!isEmpty(tail(matchValue))) {
+          if (isEmpty(tail(tail(matchValue)))) {
+            matchResult = 0;
+            otherType = head(tail(matchValue));
+          } else {
+            matchResult = 1;
+          }
+        } else {
+          matchResult = 1;
+        }
+      } else {
+        matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+    switch (matchResult) {
+      case 0:
+        return otherType;
+      default:
+        return void 0;
+    }
+  } else {
+    return void 0;
+  }
+}
 function $007CPrimitiveType$007CComplexType$007C(t) {
   switch (t.tag) {
     case /* Directory */
     1:
       return FSharpChoice$2_Choice1Of2("Directory");
-    case /* Dirent */
-    2:
-      return FSharpChoice$2_Choice1Of2("Dirent");
     case /* String */
-    3:
+    2:
       return FSharpChoice$2_Choice1Of2("string");
     case /* Int */
-    4:
+    3:
       return FSharpChoice$2_Choice1Of2("int");
     case /* Long */
-    5:
+    4:
       return FSharpChoice$2_Choice1Of2("long");
     case /* Float */
-    6:
+    5:
       return FSharpChoice$2_Choice1Of2("float");
     case /* Double */
-    7:
+    6:
       return FSharpChoice$2_Choice1Of2("double");
     case /* Boolean */
-    8:
+    7:
       return FSharpChoice$2_Choice1Of2("boolean");
+    case /* Any */
+    8:
+      return FSharpChoice$2_Choice1Of2("Any");
+    case /* Reference */
+    12:
+      return FSharpChoice$2_Choice1Of2(t.fields[0]);
     case /* Null */
-    10:
+    17:
       return FSharpChoice$2_Choice1Of2("null");
     case /* Stdout */
     9:
       return FSharpChoice$2_Choice1Of2("stdout");
+    case /* Stderr */
+    10:
+      return FSharpChoice$2_Choice1Of2("stderr");
+    case /* Stdin */
+    11:
+      return FSharpChoice$2_Choice1Of2("stdin");
     case /* Record */
-    12:
+    19:
     case /* Enum */
-    13:
+    20:
     case /* Union */
+    21:
+    case /* ImportedType */
+    13:
+    case /* IncludedType */
     14:
+    case /* MixedType */
+    15:
+    case /* RawType */
+    16:
       return FSharpChoice$2_Choice2Of2(void 0);
     case /* Array */
-    11: {
+    18: {
       const arraySchema = t.fields[0];
       const matchValue = arraySchema.Items;
       if ($007CPrimitiveType$007CComplexType$007C(matchValue).tag === /* Choice2Of2 */
@@ -80,8 +134,15 @@ function $007CPrimitiveType$007CComplexType$007C(t) {
       return FSharpChoice$2_Choice1Of2("File");
   }
 }
+function isPlainArray(schema) {
+  if (schema.Label == null && schema.Doc == null && schema.Name == null) {
+    return isEmpty$1(dynamicPropertiesExcept(InputArraySchema.KnownFieldNames, schema));
+  } else {
+    return false;
+  }
+}
 function tryGetArrayShorthand(cwlType) {
-  let matchResult = void 0, name_1 = void 0, arraySchema = void 0;
+  let matchResult = void 0, name_1 = void 0, arraySchema_2 = void 0;
   const activePatternResult = $007CPrimitiveType$007CComplexType$007C(cwlType);
   if (activePatternResult.tag === /* Choice1Of2 */
   0) {
@@ -89,16 +150,24 @@ function tryGetArrayShorthand(cwlType) {
       matchResult = 0;
       name_1 = activePatternResult.fields[0];
     } else if (cwlType.tag === /* Array */
-    11) {
-      matchResult = 1;
-      arraySchema = cwlType.fields[0];
+    18) {
+      if (isPlainArray(cwlType.fields[0])) {
+        matchResult = 1;
+        arraySchema_2 = cwlType.fields[0];
+      } else {
+        matchResult = 2;
+      }
     } else {
       matchResult = 2;
     }
   } else if (cwlType.tag === /* Array */
-  11) {
-    matchResult = 1;
-    arraySchema = cwlType.fields[0];
+  18) {
+    if (isPlainArray(cwlType.fields[0])) {
+      matchResult = 1;
+      arraySchema_2 = cwlType.fields[0];
+    } else {
+      matchResult = 2;
+    }
   } else {
     matchResult = 2;
   }
@@ -106,9 +175,9 @@ function tryGetArrayShorthand(cwlType) {
     case 0:
       return name_1;
     case 1: {
-      const option_1 = tryGetArrayShorthand(arraySchema.Items);
+      const option_1 = tryGetArrayShorthand(arraySchema_2.Items);
       if (option_1 != null) {
-        return value(option_1) + "[]";
+        return option_1 + "[]";
       } else {
         return void 0;
       }
@@ -117,126 +186,298 @@ function tryGetArrayShorthand(cwlType) {
       return void 0;
   }
 }
+function tryGetDocumentArrayShorthand(schema) {
+  const matchValue = schema.Items;
+  let matchResult = void 0, name_1 = void 0;
+  const activePatternResult = $007CPrimitiveType$007CComplexType$007C(matchValue);
+  if (activePatternResult.tag === /* Choice1Of2 */
+  0) {
+    if (activePatternResult.fields[0] !== "array" && isPlainArray(schema)) {
+      matchResult = 0;
+      name_1 = activePatternResult.fields[0];
+    } else {
+      matchResult = 1;
+    }
+  } else {
+    matchResult = 1;
+  }
+  switch (matchResult) {
+    case 0:
+      return name_1 + "[]";
+    default:
+      return void 0;
+  }
+}
 function isComplexType(t_mut) {
   isComplexType:
     while (true) {
       const t = t_mut;
+      let matchResult = void 0, otherType = void 0;
       switch (t.tag) {
         case /* Record */
-        12:
+        19:
         case /* Enum */
+        20:
+        case /* ImportedType */
         13:
-          return true;
+        case /* IncludedType */
+        14:
+        case /* MixedType */
+        15:
+        case /* RawType */
+        16: {
+          matchResult = 0;
+          break;
+        }
         case /* Array */
-        11: {
-          const arraySchema = t.fields[0];
-          return tryGetArrayShorthand(arraySchema.Items) == null;
+        18: {
+          matchResult = 1;
+          break;
         }
         case /* Union */
-        14: {
-          const typesList = toList(t.fields[0]);
-          let matchResult = void 0, otherType = void 0;
-          if (!isEmpty(typesList)) {
-            if (head(typesList).tag === /* Null */
-            10) {
-              if (!isEmpty(tail(typesList))) {
-                if (isEmpty(tail(tail(typesList)))) {
-                  matchResult = 0;
-                  otherType = head(tail(typesList));
-                } else {
-                  matchResult = 1;
-                }
-              } else {
-                matchResult = 1;
-              }
-            } else if (!isEmpty(tail(typesList))) {
-              if (head(tail(typesList)).tag === /* Null */
-              10) {
-                if (isEmpty(tail(tail(typesList)))) {
-                  matchResult = 0;
-                  otherType = head(typesList);
-                } else {
-                  matchResult = 1;
-                }
-              } else {
-                matchResult = 1;
-              }
-            } else {
-              matchResult = 1;
-            }
+        21: {
+          const activePatternResult = $007COptionalOf$007C_$007C(t);
+          if (activePatternResult != null) {
+            matchResult = 2;
+            otherType = activePatternResult;
           } else {
-            matchResult = 1;
+            matchResult = 3;
           }
-          switch (matchResult) {
-            case 0: {
-              t_mut = otherType;
-              continue isComplexType;
-            }
-            default:
-              return true;
+          break;
+        }
+        default: {
+          const activePatternResult_1 = $007COptionalOf$007C_$007C(t);
+          if (activePatternResult_1 != null) {
+            matchResult = 2;
+            otherType = activePatternResult_1;
+          } else {
+            matchResult = 4;
           }
         }
+      }
+      switch (matchResult) {
+        case 0:
+          return true;
+        case 1:
+          return tryGetArrayShorthand(t) == null;
+        case 2: {
+          t_mut = otherType;
+          continue isComplexType;
+        }
+        case 3:
+          return true;
         default:
           return false;
       }
       break;
     }
 }
-function yBool(b) {
-  return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(b ? "true" : "false"));
+function literalBlock(value) {
+  return YamlNodeModule_scalar(ScalarStyle_Block(BlockScalarStyle.Literal, ChompingMode.Strip, void 0), value);
 }
-function yFloat(value) {
-  return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(value.toString()));
+function multiLineScalar(value) {
+  if (holdsLineBreakCharacter(value)) {
+    return YamlNodeModule_scalar(ScalarStyle.DoubleQuoted, value);
+  } else {
+    return literalBlock(value);
+  }
+}
+function encodeString(value) {
+  if (value.indexOf("\n") >= 0) {
+    return multiLineScalar(value);
+  } else {
+    return textNode(value);
+  }
 }
-function yMap(pairs) {
-  return YAMLElement_Object$(map((tupledArg) => {
-    let _arg = void 0, single = void 0;
-    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 : _arg : _arg));
-  }, pairs));
+function encodeSourceText(source, text) {
+  if (source == null) {
+    return encodeString(text);
+  } else {
+    const node = source;
+    const matchValue = node.Kind;
+    switch (matchValue.tag) {
+      case /* Scalar */
+      0:
+        return keepAsText(YamlNodeModule_withScalarValue(text, node));
+      case /* Sequence */
+      2:
+        if (join("", map((item) => {
+          const matchValue_1 = item.Node.Kind;
+          if (matchValue_1.tag === /* Scalar */
+          0) {
+            return matchValue_1.fields[0].Value;
+          } else {
+            return "";
+          }
+        }, matchValue.fields[0].Items)) === text) {
+          return normalizeTree(node);
+        } else {
+          return encodeString(text);
+        }
+      default:
+        return encodeString(text);
+    }
+  }
+}
+function startsWithTrivia(node) {
+  if (node.Properties.Tag != null ? true : node.Properties.Anchor != null) {
+    return false;
+  } else {
+    const matchValue = node.Kind;
+    let matchResult = void 0, collection_2 = void 0, collection_3 = void 0;
+    switch (matchValue.tag) {
+      case /* Mapping */
+      1: {
+        if (equals(matchValue.fields[0].Style, CollectionStyle.Block)) {
+          matchResult = 0;
+          collection_2 = matchValue.fields[0];
+        } else {
+          matchResult = 2;
+        }
+        break;
+      }
+      case /* Sequence */
+      2: {
+        if (equals(matchValue.fields[0].Style, CollectionStyle.Block)) {
+          matchResult = 1;
+          collection_3 = matchValue.fields[0];
+        } else {
+          matchResult = 2;
+        }
+        break;
+      }
+      default:
+        matchResult = 2;
+    }
+    switch (matchResult) {
+      case 0: {
+        const matchValue_1 = collection_2.Items;
+        if (isEmpty(matchValue_1)) {
+          return false;
+        } else {
+          return !isEmpty(head(matchValue_1).Before);
+        }
+      }
+      case 1: {
+        const matchValue_2 = collection_3.Items;
+        if (isEmpty(matchValue_2)) {
+          return false;
+        } else {
+          return !isEmpty(head(matchValue_2).Before);
+        }
+      }
+      default:
+        return false;
+    }
+  }
+}
+const lineBreakDash = Separation_NewLine(new LineBreak(void 0, empty()));
+function blockItem(node) {
+  const item = YamlNodeModule_item(node);
+  if (startsWithTrivia(node)) {
+    return new SequenceItem(item.Before, lineBreakDash, item.Node, item.Span);
+  } else {
+    return item;
+  }
+}
+function encodeSequence(items) {
+  if (forAll((node) => {
+    const matchValue = node.Kind;
+    if (matchValue.tag === /* Scalar */
+    0) {
+      const scalar = matchValue.fields[0];
+      if (scalar.Style.tag === /* Block */
+      3) {
+        return false;
+      } else if (!(scalar.Value.indexOf("\n") >= 0) && node.TrailingComment == null) {
+        return !YamlNodeModule_isMissingValue(node);
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  }, items)) {
+    return YamlNodeModule_flowSequence(map(YamlNodeModule_item, items));
+  } else {
+    return YamlNodeModule_sequence(map(blockItem, items));
+  }
+}
+function encodeObject(pairs) {
+  const node = Encode_object(pairs);
+  const matchValue = node.Kind;
+  if (matchValue.tag === /* Mapping */
+  1) {
+    const collection = matchValue.fields[0];
+    return new YamlNode(YamlNodeKind_Mapping(new Collection$1(collection.Style, collection.OpeningComment, map((entry) => new MappingEntry(entry.Before, entry.Question, keepAsText(entry.Key), entry.BeforeColon, entry.Colon, entry.Value, entry.Span), collection.Items), collection.End)), node.Properties, node.PropertyLayout, node.TrailingComment, node.Span);
+  } else {
+    return node;
+  }
+}
+function idObject(idKey, valueKey, id, node) {
+  let fields;
+  const matchValue = node.Kind;
+  fields = matchValue.tag === /* Mapping */
+  1 ? map((entry) => [Decode_entryName(entry), entry.Value], matchValue.fields[0].Items) : singleton([valueKey, node]);
+  return encodeObject(cons([idKey, textNode(id)], fields));
+}
+function encodeIdMapOrList(idKey, valueKey, entries) {
+  const ids = map((tuple) => tuple[0], entries);
+  if (length(List_distinct(ids, {
+    Equals: (x, y) => x === y,
+    GetHashCode: (x) => stringHash(x) | 0
+  })) === length(ids)) {
+    return encodeObject(entries);
+  } else {
+    return encodeSequence(map((tupledArg) => idObject(idKey, valueKey, tupledArg[0], tupledArg[1]), entries));
+  }
+}
+function rawYamlNode(raw) {
+  return normalizeTree(raw.Node);
 }
 function encodeDynamicValue(value) {
   if (equals(value, defaultOf())) {
     return void 0;
   } else if (typeof value === "string") {
     const s = value;
-    return string(s);
+    return encodeString(s);
   } else if (typeof value === "boolean") {
     const b = value;
-    return yBool(b);
+    return Encode_bool(b);
   } else if (typeof value === "number") {
     const f = value;
-    return yFloat(f);
+    return Encode_float(f);
   } else if (typeof value === "number") {
     const i = value | 0;
-    return int(i);
+    return Encode_int(i);
   } else if (typeof value === "bigint") {
     const i_1 = value;
-    return string(int64ToString(i_1));
-  } else if (value instanceof YAMLElement) {
+    return Encode_int64(i_1);
+  } else if (value instanceof RawYaml) {
+    const raw = value;
+    return rawYamlNode(raw);
+  } else if (value instanceof YamlNode) {
     const y = value;
-    return y;
+    return normalizeTree(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)));
+    return encodeSequence(toList(choose(encodeDynamicValue, values)));
   } else {
     return void 0;
   }
 }
 function encodeDynamicObj(dynObj) {
-  return yMap(toList(choose((kvp) => {
+  return encodeObject(toList(choose((kvp) => {
     const option_1 = encodeDynamicValue(kvp[1]);
     if (option_1 != null) {
-      return [kvp[0], value(option_1)];
+      return [kvp[0], option_1];
     } else {
       return void 0;
     }
-  }, dynamicPropertiesExcept(empty({
+  }, dynamicPropertiesExcept(empty$1({
     Compare: (x, y) => comparePrimitives(x, y) | 0
   }), dynObj))));
 }
@@ -244,62 +485,276 @@ function appendDynamicPropertiesExcept(knownFieldNames, dynObj, acc) {
   return fold((pairs, pair) => append(pairs, singleton(pair)), acc, choose((kvp) => {
     const option_1 = encodeDynamicValue(kvp[1]);
     if (option_1 != null) {
-      return [kvp[0], value(option_1)];
+      return [kvp[0], option_1];
     } else {
       return void 0;
     }
   }, dynamicPropertiesExcept(knownFieldNames, dynObj)));
 }
 function appendDynamicProperties(dynObj, acc) {
-  return appendDynamicPropertiesExcept(empty({
+  return appendDynamicPropertiesExcept(empty$1({
     Compare: (x, y) => comparePrimitives(x, y) | 0
   }), dynObj, acc);
 }
 function normalizeDocString(doc) {
-  return trimEnd(trimEnd(replace(doc, "\r\n", "\n"), "\n"), "\r");
+  return replace(doc, "\r\n", "\n");
 }
 function encodeExpressionScalar(expression) {
-  const normalized = Operators_IsNull(expression) ? "" : replace(replace(expression, "\r\n", "\n"), "\r", "\n");
-  return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(normalized, void 0, void 0, void 0, normalized.indexOf("\n") >= 0 ? ScalarStyle_Block(BlockScalarStyle.Literal, ChompingMode.Clip, void 0) : ScalarStyle.DoubleQuoted));
+  const normalized = expression == null ? "" : replace(replace(expression, "\r\n", "\n"), "\r", "\n");
+  if (normalized.indexOf("\n") >= 0) {
+    return multiLineScalar(normalized);
+  } else {
+    return YamlNodeModule_scalar(ScalarStyle.DoubleQuoted, normalized);
+  }
 }
-function encodeSchemaSaladString(value) {
+function directive(key, path) {
+  return YamlNodeModule_flowMapping(singleton(YamlNodeModule_entry(Encode_string(key), encodeString(path))));
+}
+function encodeListEntry(encodeValue, entry) {
+  switch (entry.tag) {
+    case /* Imported */
+    1:
+      return directive("$import", entry.fields[0]);
+    case /* Mixed */
+    2:
+      return entry.fields[0].Node;
+    default:
+      return encodeValue(entry.fields[0]);
+  }
+}
+function encodeIdEntries(idKey, valueKey, whole, entries) {
+  let matchResult = void 0, path = void 0;
+  if (whole) {
+    if (!isEmpty(entries)) {
+      if (head(entries).tag === /* Imported */
+      1) {
+        if (isEmpty(tail(entries))) {
+          matchResult = 0;
+          path = head(entries).fields[0];
+        } else {
+          matchResult = 1;
+        }
+      } else {
+        matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+  } else {
+    matchResult = 1;
+  }
+  switch (matchResult) {
+    case 0:
+      return directive("$import", path);
+    default: {
+      const named = choose$1((entry) => ListEntry$1.tryValue(entry), entries);
+      if (length(named) === length(entries)) {
+        return encodeIdMapOrList(idKey, valueKey, named);
+      } else {
+        return encodeSequence(map((entry_1) => encodeListEntry((tupledArg) => idObject(idKey, valueKey, tupledArg[0], tupledArg[1]), entry_1), entries));
+      }
+    }
+  }
+}
+function encodeSchemaSaladStringWith(encodeLiteral, value) {
   switch (value.tag) {
     case /* Include */
     1:
-      return yMap(singleton(["$include", string(value.fields[0])]));
+      return directive("$include", value.fields[0]);
     case /* Import */
     2:
-      return yMap(singleton(["$import", string(value.fields[0])]));
+      return directive("$import", value.fields[0]);
+    case /* Mixin */
+    3:
+      return directive("$mixin", value.fields[0]);
+    case /* Mixed */
+    4:
+      return value.fields[0].Node;
     default:
-      return string(value.fields[0]);
+      return encodeLiteral(value.fields[0]);
   }
 }
-function normalizeEnvValueForEncode(envValue) {
-  if (envValue === "true" ? true : envValue === "false") {
-    return '"' + envValue + '"';
-  } else {
-    return envValue;
+function encodeSchemaSaladString(value) {
+  return encodeSchemaSaladStringWith(encodeString, value);
+}
+function encodeSchemaSaladBool(value) {
+  switch (value.tag) {
+    case /* Imported */
+    1:
+      return directive("$import", value.fields[0]);
+    case /* Mixed */
+    2:
+      return value.fields[0].Node;
+    default:
+      return Encode_bool(value.fields[0]);
   }
 }
-function encodeEnvVarRequirementCompactMap(envs) {
-  const envDefMap = yMap(toList(map$1((env) => [env.EnvName, string(normalizeEnvValueForEncode(env.EnvValue))], envs)));
-  return yMap(ofArray([["class", string("EnvVarRequirement")], ["envDef", envDefMap]]));
+function encodeFileSize(size) {
+  switch (size.tag) {
+    case /* Imported */
+    1:
+      return directive("$import", size.fields[0]);
+    case /* Mixed */
+    2:
+      return size.fields[0].Node;
+    default:
+      return Encode_int64(size.fields[0]);
+  }
 }
-function encodeSoftwareRequirementCompactMap(packages) {
-  const packagesMap = yMap(toList(map$1((package$_1) => {
-    let package$ = void 0, matchValue = void 0, matchValue_1 = void 0, acc_2 = void 0, value_3 = void 0, acc_1 = void 0, value_6 = void 0, acc_3 = void 0;
-    return [package$_1.Package, (package$ = package$_1, matchValue = package$.Version, matchValue_1 = package$.Specs, matchValue == null ? matchValue_1 != null ? YAMLElement_Sequence(toList(map$1(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$1(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$1(string, value(value_6))))])))))];
-  }, packages)));
-  return yMap(ofArray([["class", string("SoftwareRequirement")], ["packages", packagesMap]]));
+function encodeLoadListing(value) {
+  switch (value.tag) {
+    case /* IncludedLoadListing */
+    4:
+      return directive("$include", value.fields[0]);
+    case /* MixedLoadListing */
+    5:
+      return value.fields[0].Node;
+    case /* NoListing */
+    0:
+    case /* ShallowListing */
+    1:
+    case /* DeepListing */
+    2:
+      return encodeString(LoadListingEnum.toCwlString(value));
+    default:
+      return directive("$import", value.fields[0]);
+  }
+}
+function encodeStringList(whole, entries) {
+  const matchValue = toList(entries);
+  let matchResult = void 0, single = void 0;
+  if (whole) {
+    if (!isEmpty(matchValue)) {
+      switch (head(matchValue).tag) {
+        case /* Import */
+        2: {
+          if (isEmpty(tail(matchValue))) {
+            matchResult = 0;
+            single = head(matchValue);
+          } else {
+            matchResult = 1;
+          }
+          break;
+        }
+        case /* Mixin */
+        3: {
+          if (isEmpty(tail(matchValue))) {
+            matchResult = 0;
+            single = head(matchValue);
+          } else {
+            matchResult = 1;
+          }
+          break;
+        }
+        case /* Mixed */
+        4: {
+          if (isEmpty(tail(matchValue))) {
+            matchResult = 0;
+            single = head(matchValue);
+          } else {
+            matchResult = 1;
+          }
+          break;
+        }
+        default:
+          matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+  } else {
+    matchResult = 1;
+  }
+  switch (matchResult) {
+    case 0:
+      return encodeSchemaSaladString(single);
+    default:
+      return encodeSequence(ofSeq(map$1(encodeSchemaSaladString, entries)));
+  }
+}
+function encodeLabelValue(source, label) {
+  if (label.tag === /* Literal */
+  0) {
+    return encodeSourceText(source, label.fields[0]);
+  } else {
+    return encodeSchemaSaladString(label);
+  }
 }
 function encodeLabel(label) {
-  return ["label", string(label)];
+  return ["label", encodeLabelValue(void 0, label)];
+}
+function encodeDocText(source, doc) {
+  return encodeSourceText(source, normalizeDocString(doc));
+}
+function encodeDocWith(encodeText, source, doc) {
+  if (doc.tag === /* Parts */
+  1) {
+    const parts = doc.fields[0];
+    return encodeSequence(ofSeq(map$1(encodeSchemaSaladString, parts)));
+  } else if (doc.fields[0].tag === /* Literal */
+  0) {
+    const text = doc.fields[0].fields[0];
+    return encodeText(source, text);
+  } else {
+    const directive_1 = doc.fields[0];
+    return encodeSchemaSaladString(directive_1);
+  }
+}
+function encodeDocValue(source, doc) {
+  return encodeDocWith(encodeSourceText, source, doc);
+}
+function encodeProcessDocValue(source, doc) {
+  return encodeDocWith(encodeDocText, source, doc);
 }
 function encodeDoc(doc) {
-  return ["doc", string(normalizeDocString(doc))];
+  return ["doc", encodeDocValue(void 0, doc)];
+}
+function encodeIntList(whole, codes) {
+  const matchValue = toList(codes);
+  let matchResult = void 0, path = void 0, raw = void 0;
+  if (whole) {
+    if (!isEmpty(matchValue)) {
+      switch (head(matchValue).tag) {
+        case /* Imported */
+        1: {
+          if (isEmpty(tail(matchValue))) {
+            matchResult = 0;
+            path = head(matchValue).fields[0];
+          } else {
+            matchResult = 2;
+          }
+          break;
+        }
+        case /* Mixed */
+        2: {
+          if (isEmpty(tail(matchValue))) {
+            matchResult = 1;
+            raw = head(matchValue).fields[0];
+          } else {
+            matchResult = 2;
+          }
+          break;
+        }
+        default:
+          matchResult = 2;
+      }
+    } else {
+      matchResult = 2;
+    }
+  } else {
+    matchResult = 2;
+  }
+  switch (matchResult) {
+    case 0:
+      return directive("$import", path);
+    case 1:
+      return raw.Node;
+    default:
+      return encodeSequence(ofSeq(map$1((entry) => encodeListEntry(Encode_int, entry), codes)));
+  }
 }
-function encodeIntent(intent) {
-  return ["intent", YAMLElement_Sequence(ofSeq(map$1(string, intent)))];
+function encodeIntent(whole, intent) {
+  return ["intent", encodeStringList(whole, intent)];
 }
 function encodeFilePairs(discriminatorKey, discriminatorValue, file) {
   let acc_22;
@@ -313,40 +768,40 @@ function encodeFilePairs(discriminatorKey, discriminatorValue, file) {
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = singleton([discriminatorKey, string(discriminatorValue)]);
+  const acc = singleton([discriminatorKey, encodeString(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))]));
+  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["location", encodeSchemaSaladString(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))]));
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["path", encodeSchemaSaladString(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))]));
+  acc_6 = value_8 == null ? acc_5 : append(acc_5, singleton(["basename", encodeSchemaSaladString(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))]));
+  acc_8 = value_11 == null ? acc_7 : append(acc_7, singleton(["dirname", encodeSchemaSaladString(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))]));
+  acc_10 = value_14 == null ? acc_9 : append(acc_9, singleton(["nameroot", encodeSchemaSaladString(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))]));
+  acc_12 = value_17 == null ? acc_11 : append(acc_11, singleton(["nameext", encodeSchemaSaladString(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))]));
+  acc_14 = value_20 == null ? acc_13 : append(acc_13, singleton(["checksum", encodeSchemaSaladString(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))))]));
+  acc_16 = value_22 == null ? acc_15 : append(acc_15, singleton(["size", encodeFileSize(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)]));
+  acc_18 = value_24 == null ? acc_17 : append(acc_17, singleton(["secondaryFiles", rawYamlNode(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))]));
+  acc_20 = value_27 == null ? acc_19 : append(acc_19, singleton(["format", encodeSchemaSaladString(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))]));
+  acc_22 = value_30 == null ? acc_21 : append(acc_21, singleton(["contents", encodeSchemaSaladString(value_30)]));
   return appendDynamicPropertiesExcept(FileInstance.KnownFieldNames, file, acc_22);
 }
 function encodeDirectoryPairs(discriminatorKey, discriminatorValue, directory) {
@@ -354,168 +809,287 @@ function encodeDirectoryPairs(discriminatorKey, discriminatorValue, directory) {
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = singleton([discriminatorKey, string(discriminatorValue)]);
+  const acc = singleton([discriminatorKey, encodeString(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))]));
+  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["location", encodeSchemaSaladString(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))]));
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["path", encodeSchemaSaladString(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))]));
+  acc_6 = value_8 == null ? acc_5 : append(acc_5, singleton(["basename", encodeSchemaSaladString(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)]));
+  acc_8 = value_10 == null ? acc_7 : append(acc_7, singleton(["listing", rawYamlNode(value_10)]));
   return appendDynamicPropertiesExcept(DirectoryInstance.KnownFieldNames, directory, acc_8);
 }
 function encodeCWLType(t) {
-  let acc_4 = void 0, acc_2 = void 0, acc = void 0, value_2 = void 0, acc_1 = void 0, value_4 = void 0, acc_3 = void 0;
+  return encodeTypeWith(true, t);
+}
+function encodeCWLTypeShorthand(t) {
+  return encodeTypeWith(false, t);
+}
+function encodeTypeWith(cwlDocument, t) {
+  const arrayShorthand = (schema) => {
+    if (cwlDocument) {
+      return tryGetDocumentArrayShorthand(schema);
+    } else {
+      return tryGetArrayShorthand(CWLType_Array$(schema));
+    }
+  };
+  const encodeMember = (t_1) => encodeTypeWith(cwlDocument, t_1);
+  let matchResult = void 0, name = void 0, path = void 0, path_1 = void 0, raw = void 0, raw_1 = void 0, otherType = void 0, types = void 0, arraySchema_1 = void 0, recordSchema = void 0, enumSchema = void 0;
   switch (t.tag) {
     case /* Directory */
-    1:
-      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((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)));
+    1: {
+      matchResult = 1;
+      break;
     }
     case /* String */
-    3:
-      return string("string");
+    2: {
+      matchResult = 2;
+      break;
+    }
     case /* Int */
-    4:
-      return string("int");
+    3: {
+      matchResult = 3;
+      break;
+    }
     case /* Long */
-    5:
-      return string("long");
+    4: {
+      matchResult = 4;
+      break;
+    }
     case /* Float */
-    6:
-      return string("float");
+    5: {
+      matchResult = 5;
+      break;
+    }
     case /* Double */
-    7:
-      return string("double");
+    6: {
+      matchResult = 6;
+      break;
+    }
     case /* Boolean */
-    8:
-      return string("boolean");
+    7: {
+      matchResult = 7;
+      break;
+    }
+    case /* Any */
+    8: {
+      matchResult = 8;
+      break;
+    }
+    case /* Reference */
+    12: {
+      matchResult = 9;
+      name = t.fields[0];
+      break;
+    }
+    case /* ImportedType */
+    13: {
+      matchResult = 10;
+      path = t.fields[0];
+      break;
+    }
+    case /* IncludedType */
+    14: {
+      matchResult = 11;
+      path_1 = t.fields[0];
+      break;
+    }
+    case /* MixedType */
+    15: {
+      matchResult = 12;
+      raw = t.fields[0];
+      break;
+    }
+    case /* RawType */
+    16: {
+      matchResult = 13;
+      raw_1 = t.fields[0];
+      break;
+    }
     case /* Stdout */
-    9:
-      return string("stdout");
+    9: {
+      matchResult = 14;
+      break;
+    }
+    case /* Stderr */
+    10: {
+      matchResult = 15;
+      break;
+    }
+    case /* Stdin */
+    11: {
+      matchResult = 16;
+      break;
+    }
     case /* Null */
-    10:
-      return string("null");
+    17: {
+      matchResult = 17;
+      break;
+    }
     case /* Union */
-    14: {
-      const types = t.fields[0];
-      const typesList = toList(types);
-      let matchResult = void 0, otherType = void 0;
-      if (!isEmpty(typesList)) {
-        if (head(typesList).tag === /* Null */
-        10) {
-          if (!isEmpty(tail(typesList))) {
-            if (isEmpty(tail(tail(typesList)))) {
-              matchResult = 0;
-              otherType = head(tail(typesList));
-            } else {
-              matchResult = 1;
-            }
-          } else {
-            matchResult = 1;
-          }
-        } else if (!isEmpty(tail(typesList))) {
-          if (head(tail(typesList)).tag === /* Null */
-          10) {
-            if (isEmpty(tail(tail(typesList)))) {
-              matchResult = 0;
-              otherType = head(typesList);
-            } else {
-              matchResult = 1;
-            }
-          } else {
-            matchResult = 1;
-          }
-        } else {
-          matchResult = 1;
-        }
+    21: {
+      const activePatternResult = $007COptionalOf$007C_$007C(t);
+      if (activePatternResult != null) {
+        matchResult = 18;
+        otherType = activePatternResult;
       } else {
-        matchResult = 1;
-      }
-      switch (matchResult) {
-        case 0:
-          switch (otherType.tag) {
-            case /* File */
-            0:
-              return string("File?");
-            case /* Directory */
-            1:
-              return string("Directory?");
-            case /* String */
-            3:
-              return string("string?");
-            case /* Int */
-            4:
-              return string("int?");
-            case /* Long */
-            5:
-              return string("long?");
-            case /* Float */
-            6:
-              return string("float?");
-            case /* Double */
-            7:
-              return string("double?");
-            case /* Boolean */
-            8:
-              return string("boolean?");
-            case /* Array */
-            11: {
-              const arraySchema = otherType.fields[0];
-              const matchValue = tryGetArrayShorthand(arraySchema.Items);
-              if (matchValue == null) {
-                return YAMLElement_Sequence(ofArray([string("null"), encodeInputArraySchema(arraySchema)]));
-              } else {
-                return string(value(matchValue) + "[]?");
-              }
-            }
-            default:
-              return YAMLElement_Sequence(map(encodeCWLType, typesList));
-          }
-        default:
-          return YAMLElement_Sequence(map(encodeCWLType, typesList));
+        matchResult = 19;
+        types = t.fields[0];
       }
+      break;
     }
     case /* Array */
-    11: {
-      const arraySchema_1 = t.fields[0];
-      const matchValue_1 = tryGetArrayShorthand(arraySchema_1.Items);
-      if (matchValue_1 == null) {
-        return encodeInputArraySchema(arraySchema_1);
+    18: {
+      const activePatternResult_1 = $007COptionalOf$007C_$007C(t);
+      if (activePatternResult_1 != null) {
+        matchResult = 18;
+        otherType = activePatternResult_1;
       } else {
-        return string(value(matchValue_1) + "[]");
+        matchResult = 20;
+        arraySchema_1 = t.fields[0];
       }
+      break;
     }
     case /* Record */
-    12: {
-      const recordSchema = t.fields[0];
-      return encodeInputRecordSchema(recordSchema);
+    19: {
+      const activePatternResult_2 = $007COptionalOf$007C_$007C(t);
+      if (activePatternResult_2 != null) {
+        matchResult = 18;
+        otherType = activePatternResult_2;
+      } else {
+        matchResult = 21;
+        recordSchema = t.fields[0];
+      }
+      break;
     }
     case /* Enum */
-    13: {
-      const enumSchema = t.fields[0];
-      return encodeInputEnumSchema(enumSchema);
+    20: {
+      const activePatternResult_3 = $007COptionalOf$007C_$007C(t);
+      if (activePatternResult_3 != null) {
+        matchResult = 18;
+        otherType = activePatternResult_3;
+      } else {
+        matchResult = 22;
+        enumSchema = t.fields[0];
+      }
+      break;
     }
     default:
-      if (length(encodeFilePairs("type", "File", t.fields[0])) > 1) {
-        const file_2 = t.fields[0];
-        return yMap(encodeFilePairs("type", "File", file_2));
+      matchResult = 0;
+  }
+  switch (matchResult) {
+    case 0:
+      return encodeString("File");
+    case 1:
+      return encodeString("Directory");
+    case 2:
+      return encodeString("string");
+    case 3:
+      return encodeString("int");
+    case 4:
+      return encodeString("long");
+    case 5:
+      return encodeString("float");
+    case 6:
+      return encodeString("double");
+    case 7:
+      return encodeString("boolean");
+    case 8:
+      return encodeString("Any");
+    case 9:
+      return encodeString(name);
+    case 10:
+      return directive("$import", path);
+    case 11:
+      return directive("$include", path_1);
+    case 12:
+      return raw.Node;
+    case 13:
+      return raw_1.Node;
+    case 14:
+      return encodeString("stdout");
+    case 15:
+      return encodeString("stderr");
+    case 16:
+      return encodeString("stdin");
+    case 17:
+      return encodeString("null");
+    case 18:
+      switch (otherType.tag) {
+        case /* File */
+        0:
+          return encodeString("File?");
+        case /* Directory */
+        1:
+          return encodeString("Directory?");
+        case /* String */
+        2:
+          return encodeString("string?");
+        case /* Int */
+        3:
+          return encodeString("int?");
+        case /* Long */
+        4:
+          return encodeString("long?");
+        case /* Float */
+        5:
+          return encodeString("float?");
+        case /* Double */
+        6:
+          return encodeString("double?");
+        case /* Boolean */
+        7:
+          return encodeString("boolean?");
+        case /* Any */
+        8:
+          return encodeString("Any?");
+        case /* Reference */
+        12:
+          return encodeString(otherType.fields[0] + "?");
+        case /* Array */
+        18: {
+          const arraySchema = otherType.fields[0];
+          const matchValue = arrayShorthand(arraySchema);
+          if (matchValue == null) {
+            return encodeSequence(ofArray([encodeString("null"), encodeInputArraySchema(arraySchema)]));
+          } else {
+            return encodeString(matchValue + "?");
+          }
+        }
+        default:
+          return encodeSequence(map(encodeMember, ofArray([CWLType.Null, otherType])));
+      }
+    case 19:
+      return encodeSequence(map(encodeMember, toList(types)));
+    case 20: {
+      const matchValue_1 = arrayShorthand(arraySchema_1);
+      if (matchValue_1 == null) {
+        return encodeInputArraySchema(arraySchema_1);
       } else {
-        return string("File");
+        return encodeString(matchValue_1);
       }
+    }
+    case 21:
+      return encodeInputRecordSchema(recordSchema);
+    default:
+      return encodeInputEnumSchema(enumSchema);
+  }
+}
+function encodeSchemaType(t) {
+  switch (t.tag) {
+    case /* Array */
+    18:
+      return encodeInputArraySchema(t.fields[0]);
+    case /* Union */
+    21:
+      return encodeSequence(ofSeq(map$1(encodeSchemaType, t.fields[0])));
+    default:
+      return encodeTypeWith(true, t);
   }
 }
 function encodeInputRecordField(field) {
@@ -523,219 +1097,277 @@ function encodeInputRecordField(field) {
   let acc_4;
   let acc_2;
   const acc = singleton(["type", encodeCWLType(field.Type)]);
-  const value_2 = field.Doc;
+  let encoder;
+  const source = field.SourceNodes.Doc;
+  encoder = (doc) => encodeDocValue(source, doc);
+  const value_1 = 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;
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["doc", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = field.SourceNodes.Label;
+  encoder_2 = (label) => encodeLabelValue(source_1, label);
+  const value_3 = field.Label;
   const acc_3 = acc_2;
-  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["label", string(value(value_5))]));
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["label", encoder_2(value_3)]));
   pairs = appendDynamicPropertiesExcept(InputRecordField.KnownFieldNames, field, acc_4);
-  return [field.Name, yMap(pairs)];
+  return [field.Name, encodeObject(pairs)];
 }
 function encodeInputRecordSchema(schema) {
-  let acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, acc = void 0, value_2 = void 0, acc_1 = void 0, value_5 = void 0, acc_3 = void 0, value_8 = void 0, acc_5 = void 0;
+  return encodeObject(inputRecordSchemaPairs(schema));
+}
+function inputRecordSchemaPairs(schema) {
   let fieldsElement;
   const matchValue = schema.Fields;
-  fieldsElement = matchValue == null ? yMap(empty$1()) : yMap(toList(map$1(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)));
+  if (matchValue == null) {
+    fieldsElement = encodeObject(empty());
+  } else {
+    const entries = toList(map$1((entry) => ListEntry$1.map(encodeInputRecordField, entry), matchValue));
+    fieldsElement = encodeIdEntries("name", "type", FSharpSet__Contains(schema.SourceNodes.WholeFields, "fields"), entries);
+  }
+  let acc_6;
+  let acc_4;
+  let acc_2;
+  const acc = ofArray([["type", encodeString("record")], ["fields", fieldsElement]]);
+  let encoder;
+  const source_2 = schema.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source_2, label);
+  const value_1 = schema.Label;
+  const acc_1 = acc;
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_3 = schema.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeDocValue(source_3, doc);
+  const value_3 = schema.Doc;
+  const acc_3 = acc_2;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["doc", encoder_2(value_3)]));
+  const value_6 = schema.Name;
+  const acc_5 = acc_4;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["name", encodeString(value_6)]));
+  return appendDynamicPropertiesExcept(InputRecordSchema.KnownFieldNames, schema, acc_6);
 }
 function encodeInputEnumSchema(schema) {
-  let acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, value_3 = void 0, acc_1 = void 0, value_6 = void 0, acc_3 = void 0, value_9 = void 0, acc_5 = void 0;
-  const pairs = append(singleton(["type", string("enum")]), singleton(["symbols", YAMLElement_Sequence(ofSeq(map$1(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)));
+  return encodeObject(inputEnumSchemaPairs(schema));
+}
+function inputEnumSchemaPairs(schema) {
+  const pairs = ofArray([["type", encodeString("enum")], ["symbols", encodeStringList(FSharpSet__Contains(schema.SourceNodes.WholeFields, "symbols"), schema.Symbols)]]);
+  let acc_6;
+  let acc_4;
+  let acc_2;
+  let encoder;
+  const source = schema.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = schema.Label;
+  const acc_1 = pairs;
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = schema.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeDocValue(source_1, doc);
+  const value_3 = schema.Doc;
+  const acc_3 = acc_2;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["doc", encoder_2(value_3)]));
+  const value_6 = schema.Name;
+  const acc_5 = acc_4;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["name", encodeString(value_6)]));
+  return appendDynamicPropertiesExcept(InputEnumSchema.KnownFieldNames, schema, acc_6);
 }
 function encodeInputArraySchema(schema) {
-  let acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, acc = void 0, value_2 = void 0, acc_1 = void 0, value_5 = void 0, acc_3 = void 0, value_8 = void 0, acc_5 = void 0;
-  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)));
+  return encodeObject(inputArraySchemaPairs(schema));
 }
-function encodeOutputBinding(ob) {
-  let acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, acc = void 0, option_1 = void 0, value_1 = void 0, acc_1 = void 0, encoder_1 = void 0, f1 = void 0, value_4 = void 0, acc_3 = void 0, value_7 = void 0, acc_5 = void 0;
-  return yMap((acc_6 = (acc_4 = (acc_2 = (acc = choose$1((x) => x, singleton((option_1 = ob.Glob, option_1 != null ? ["glob", string(value(option_1))] : void 0))), 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 inputArraySchemaPairs(schema) {
+  let acc_6;
+  let acc_4;
+  let acc_2;
+  const acc = ofArray([["type", encodeString("array")], ["items", encodeSchemaType(schema.Items)]]);
+  let encoder;
+  const source = schema.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = schema.Label;
+  const acc_1 = acc;
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = schema.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeDocValue(source_1, doc);
+  const value_3 = schema.Doc;
+  const acc_3 = acc_2;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["doc", encoder_2(value_3)]));
+  const value_6 = schema.Name;
+  const acc_5 = acc_4;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["name", encodeString(value_6)]));
+  return appendDynamicPropertiesExcept(InputArraySchema.KnownFieldNames, schema, acc_6);
 }
-function encodeStringArrayOrScalar(values) {
-  if (values.length === 1) {
-    return string(item(0, values));
+function encodeOutputGlob(glob) {
+  if (glob.tag === /* Multiple */
+  1) {
+    return encodeSequence(ofSeq(map$1(encodeSchemaSaladString, glob.fields[0])));
   } else {
-    return YAMLElement_Sequence(ofSeq(map$1(string, values)));
+    return encodeSchemaSaladString(glob.fields[0]);
   }
 }
+function encodeOutputBinding(ob) {
+  let acc_8 = void 0, acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, value_1 = void 0, acc_1 = void 0, value_4 = void 0, acc_3 = void 0, value_7 = void 0, acc_5 = void 0, value_10 = void 0, acc_7 = void 0;
+  return encodeObject((acc_8 = (acc_6 = (acc_4 = (acc_2 = (value_1 = ob.Glob, acc_1 = empty(), value_1 == null ? acc_1 : append(acc_1, singleton(["glob", encodeOutputGlob(value_1)]))), value_4 = ob.LoadContents, acc_3 = acc_2, value_4 == null ? acc_3 : append(acc_3, singleton(["loadContents", encodeSchemaSaladBool(value_4)]))), value_7 = ob.LoadListing, acc_5 = acc_4, value_7 == null ? acc_5 : append(acc_5, singleton(["loadListing", encodeLoadListing(value_7)]))), value_10 = ob.OutputEval, acc_7 = acc_6, value_10 == null ? acc_7 : append(acc_7, singleton(["outputEval", encodeSchemaSaladString(value_10)]))), appendDynamicPropertiesExcept(OutputBinding.KnownFieldNames, ob, acc_8)));
+}
 function encodeCWLParameterValue(value) {
   switch (value.tag) {
     case /* String */
     1:
-      return string(value.fields[0]);
+      return encodeString(value.fields[0]);
     case /* Int */
     2:
-      return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(int64ToString(value.fields[0])));
+      return Encode_int64(value.fields[0]);
     case /* Float */
     3:
-      return YAMLElement_Value(YAMLContent_create_Z1C3A29C9(CWLParameterValueModule_floatToRoundTripString(value.fields[0])));
+      return Encode_float(value.fields[0]);
     case /* Boolean */
     4:
-      return yBool(value.fields[0]);
+      return Encode_bool(value.fields[0]);
     case /* File */
     5:
-      return yMap(encodeFilePairs("class", "File", value.fields[0]));
+      return encodeObject(encodeFilePairs("class", "File", value.fields[0]));
     case /* Directory */
     6:
-      return yMap(encodeDirectoryPairs("class", "Directory", value.fields[0]));
+      return encodeObject(encodeDirectoryPairs("class", "Directory", value.fields[0]));
     case /* Array */
     7:
-      return YAMLElement_Sequence(toList(map$1(encodeCWLParameterValue, value.fields[0])));
+      return encodeSequence(toList(map$1(encodeCWLParameterValue, value.fields[0])));
     case /* Record */
     8:
-      return yMap(toList(map$1((field) => [field.Name, encodeCWLParameterValue(field.Value)], value.fields[0])));
+      return encodeObject(toList(map$1((field) => [field.Name, encodeCWLParameterValue(field.Value)], value.fields[0])));
+    default:
+      return Encode_nullValue;
+  }
+}
+function encodePortEntry(name, type_, otherPairs) {
+  let option_3 = void 0;
+  let matchValue;
+  const option_1 = type_;
+  matchValue = option_1 != null ? encodeCWLType(option_1) : void 0;
+  let matchResult = void 0, typeNode = void 0, typeNode_1 = void 0;
+  if (matchValue != null) {
+    if (isEmpty(otherPairs)) {
+      matchResult = 0;
+      typeNode = matchValue;
+    } else {
+      matchResult = 1;
+      typeNode_1 = matchValue;
+    }
+  } else {
+    matchResult = 1;
+    typeNode_1 = matchValue;
+  }
+  switch (matchResult) {
+    case 0:
+      if (typeNode.Kind.tag === /* Mapping */
+      1) {
+        return [name, encodeObject(singleton(["type", typeNode]))];
+      } else {
+        return [name, typeNode];
+      }
     default:
-      return YAMLElement_Value(YAMLContent_create_Z1C3A29C9("null"));
+      return [name, encodeObject(append(ofArray(toArray((option_3 = typeNode_1, option_3 != null ? ["type", option_3] : void 0))), otherPairs))];
   }
 }
 function encodeCWLOutput(o) {
-  let t = void 0, typesList = void 0, arraySchema = void 0, matchValue = void 0, arraySchema_1 = void 0, matchValue_1 = void 0, values = void 0;
-  let typeElement;
-  const option_1 = o.Type_;
-  typeElement = option_1 != null ? (t = value(option_1), t.tag === /* Union */
-  14 ? (typesList = toList(t.fields[0]), !isEmpty(typesList) ? head(typesList).tag === /* Null */
-  10 ? !isEmpty(tail(typesList)) ? isEmpty(tail(tail(typesList))) ? head(tail(typesList)).tag === /* File */
-  0 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Directory */
-  1 ? encodeCWLType(t) : head(tail(typesList)).tag === /* String */
-  3 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Int */
-  4 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Long */
-  5 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Float */
-  6 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Double */
-  7 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Boolean */
-  8 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Array */
-  11 ? (arraySchema = head(tail(typesList)).fields[0], matchValue = arraySchema.Items, matchValue.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue.tag === /* Boolean */
-  8 ? encodeCWLType(t) : encodeCWLType(t)) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : !isEmpty(tail(typesList)) ? head(tail(typesList)).tag === /* Null */
-  10 ? isEmpty(tail(tail(typesList))) ? head(typesList).tag === /* File */
-  0 ? encodeCWLType(t) : head(typesList).tag === /* Directory */
-  1 ? encodeCWLType(t) : head(typesList).tag === /* String */
-  3 ? encodeCWLType(t) : head(typesList).tag === /* Int */
-  4 ? encodeCWLType(t) : head(typesList).tag === /* Long */
-  5 ? encodeCWLType(t) : head(typesList).tag === /* Float */
-  6 ? encodeCWLType(t) : head(typesList).tag === /* Double */
-  7 ? encodeCWLType(t) : head(typesList).tag === /* Boolean */
-  8 ? encodeCWLType(t) : head(typesList).tag === /* Array */
-  11 ? (arraySchema = head(typesList).fields[0], matchValue = arraySchema.Items, matchValue.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue.tag === /* Boolean */
-  8 ? encodeCWLType(t) : encodeCWLType(t)) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t)) : t.tag === /* Array */
-  11 ? (arraySchema_1 = t.fields[0], matchValue_1 = arraySchema_1.Items, matchValue_1.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue_1.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue_1.tag === /* Dirent */
-  2 ? encodeCWLType(t) : matchValue_1.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue_1.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue_1.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue_1.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue_1.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue_1.tag === /* Boolean */
-  8 ? encodeCWLType(t) : yMap(singleton(["type", encodeInputArraySchema(arraySchema_1)]))) : t.tag === /* Record */
-  12 ? yMap(singleton(["type", encodeInputRecordSchema(t.fields[0])])) : t.tag === /* Enum */
-  13 ? yMap(singleton(["type", encodeInputEnumSchema(t.fields[0])])) : encodeCWLType(t)) : void 0;
-  let pairs;
-  let acc_16;
-  let value_17;
-  const matchValue_2 = o.OutputSource;
-  let matchResult = void 0, value$1 = void 0, values_1 = void 0;
-  if (matchValue_2 != null) {
-    if (value(matchValue_2).tag === /* Multiple */
+  let values = void 0;
+  let otherPairs;
+  let acc_14;
+  let value_16;
+  const matchValue = o.OutputSource;
+  let matchResult = void 0, value = void 0, values_1 = void 0;
+  if (matchValue != null) {
+    if (matchValue.tag === /* Multiple */
     1) {
-      if (values = value(matchValue_2).fields[0], values.length > 0) {
+      if (values = matchValue.fields[0], values.length > 0) {
         matchResult = 1;
-        values_1 = value(matchValue_2).fields[0];
+        values_1 = matchValue.fields[0];
       } else {
         matchResult = 2;
       }
     } else {
       matchResult = 0;
-      value$1 = value(matchValue_2).fields[0];
+      value = matchValue.fields[0];
     }
   } else {
     matchResult = 2;
   }
   switch (matchResult) {
     case 0: {
-      value_17 = string(value$1);
+      value_16 = encodeSchemaSaladString(value);
       break;
     }
     case 1: {
-      value_17 = encodeStringArrayOrScalar(values_1);
+      value_16 = encodeSequence(ofSeq(map$1(encodeSchemaSaladString, values_1)));
       break;
     }
     default:
-      value_17 = void 0;
+      value_16 = void 0;
   }
-  let acc_15;
-  let acc_12;
+  let acc_13;
   let acc_10;
   let acc_8;
   let acc_6;
   let acc_4;
   let acc_2;
-  const value_1 = typeElement;
-  const acc_1 = empty$1();
-  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["type", value(value_1)]));
-  const value_4 = o.Label;
+  let encoder;
+  const source_2 = o.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source_2, label);
+  const value_3 = o.Label;
+  const acc_1 = empty();
+  acc_2 = value_3 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_3)]));
+  const value_5 = o.SecondaryFiles;
   const acc_3 = acc_2;
-  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)]));
+  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["secondaryFiles", rawYamlNode(value_5)]));
   const value_8 = o.Streamable;
+  const acc_5 = acc_4;
+  acc_6 = value_8 == null ? acc_5 : append(acc_5, singleton(["streamable", encodeSchemaSaladBool(value_8)]));
+  let encoder_4;
+  const source_3 = o.SourceNodes.Doc;
+  encoder_4 = (doc) => encodeDocValue(source_3, doc);
+  const value_10 = o.Doc;
   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;
+  acc_8 = value_10 == null ? acc_7 : append(acc_7, singleton(["doc", encoder_4(value_10)]));
+  const value_13 = o.Format;
   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;
+  acc_10 = value_13 == null ? acc_9 : append(acc_9, singleton(["format", encodeSchemaSaladString(value_13)]));
+  const value_15 = o.OutputBinding;
   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_1 = void 0, t_1 = void 0;
-  if (!isEmpty(pairs)) {
-    if (head(pairs)[0] === "type") {
-      if (isEmpty(tail(pairs))) {
-        matchResult_1 = 0;
-        t_1 = head(pairs)[1];
-      } else {
-        matchResult_1 = 1;
-      }
-    } else {
-      matchResult_1 = 1;
-    }
-  } else {
-    matchResult_1 = 1;
-  }
-  switch (matchResult_1) {
-    case 0:
-      return [o.Name, t_1];
+  acc_13 = value_15 == null ? acc_11 : append(acc_11, singleton(["outputBinding", encodeListEntry(encodeOutputBinding, value_15)]));
+  acc_14 = value_16 == null ? acc_13 : append(acc_13, singleton(["outputSource", value_16]));
+  otherPairs = appendDynamicPropertiesExcept(CWLOutput.KnownFieldNames, o, acc_14);
+  return encodePortEntry(o.Name, o.Type_, otherPairs);
+}
+function encodeBindingPosition(position) {
+  switch (position.tag) {
+    case /* Expression */
+    1:
+      return encodeString(position.fields[0]);
+    case /* Imported */
+    2:
+      return directive("$import", position.fields[0]);
+    case /* Included */
+    3:
+      return directive("$include", position.fields[0]);
+    case /* Mixed */
+    4:
+      return position.fields[0].Node;
     default:
-      return [o.Name, yMap(pairs)];
+      return Encode_int(position.fields[0]);
   }
 }
 function encodeInputBinding(ib) {
-  let acc_14 = void 0, acc_12 = void 0, acc_10 = void 0, acc_8 = void 0, acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, value_1 = void 0, acc_1 = void 0, value_4 = void 0, acc_3 = void 0, value_6 = void 0, acc_5 = void 0, value_9 = void 0, acc_7 = void 0, value_11 = void 0, acc_9 = void 0, value_14 = void 0, acc_11 = void 0, value_16 = void 0, acc_13 = void 0;
-  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)));
+  let acc_14 = void 0, acc_12 = void 0, acc_10 = void 0, acc_8 = void 0, acc_6 = void 0, acc_4 = void 0, acc_2 = void 0, value_2 = void 0, acc_1 = void 0, value_5 = void 0, acc_3 = void 0, value_7 = void 0, acc_5 = void 0, value_10 = void 0, acc_7 = void 0, value_13 = void 0, acc_9 = void 0, value_16 = void 0, acc_11 = void 0, value_19 = void 0, acc_13 = void 0;
+  return encodeObject((acc_14 = (acc_12 = (acc_10 = (acc_8 = (acc_6 = (acc_4 = (acc_2 = (value_2 = ib.LoadContents, acc_1 = empty(), value_2 == null ? acc_1 : append(acc_1, singleton(["loadContents", encodeSchemaSaladBool(value_2)]))), value_5 = ib.Prefix, acc_3 = acc_2, value_5 == null ? acc_3 : append(acc_3, singleton(["prefix", encodeSchemaSaladString(value_5)]))), value_7 = ib._position, acc_5 = acc_4, value_7 == null ? acc_5 : append(acc_5, singleton(["position", encodeBindingPosition(value_7)]))), value_10 = ib.ItemSeparator, acc_7 = acc_6, value_10 == null ? acc_7 : append(acc_7, singleton(["itemSeparator", encodeSchemaSaladString(value_10)]))), value_13 = ib.Separate, acc_9 = acc_8, value_13 == null ? acc_9 : append(acc_9, singleton(["separate", encodeSchemaSaladBool(value_13)]))), value_16 = ib.ValueFrom, acc_11 = acc_10, value_16 == null ? acc_11 : append(acc_11, singleton(["valueFrom", encodeSchemaSaladString(value_16)]))), value_19 = ib.ShellQuote, acc_13 = acc_12, value_19 == null ? acc_13 : append(acc_13, singleton(["shellQuote", encodeSchemaSaladBool(value_19)]))), appendDynamicPropertiesExcept(InputBinding.KnownFieldNames, ib, acc_14)));
+}
+function encodeInputFormat(format) {
+  if (format.tag === /* Multiple */
+  1) {
+    return encodeSequence(ofSeq(map$1(encodeSchemaSaladString, format.fields[0])));
+  } else {
+    return encodeSchemaSaladString(format.fields[0]);
+  }
 }
 function encodeCWLInput(i) {
-  let t = void 0, typesList = void 0, arraySchema = void 0, matchValue = void 0, arraySchema_1 = void 0, matchValue_1 = void 0;
-  let pairs;
-  let acc_20;
+  let otherPairs;
   let acc_18;
   let acc_16;
   let acc_14;
@@ -745,116 +1377,47 @@ function encodeCWLInput(i) {
   let acc_6;
   let acc_4;
   let acc_2;
-  let value$1;
-  const option_1 = i.Type_;
-  value$1 = option_1 != null ? (t = value(option_1), t.tag === /* Union */
-  14 ? (typesList = toList(t.fields[0]), !isEmpty(typesList) ? head(typesList).tag === /* Null */
-  10 ? !isEmpty(tail(typesList)) ? isEmpty(tail(tail(typesList))) ? head(tail(typesList)).tag === /* File */
-  0 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Directory */
-  1 ? encodeCWLType(t) : head(tail(typesList)).tag === /* String */
-  3 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Int */
-  4 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Long */
-  5 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Float */
-  6 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Double */
-  7 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Boolean */
-  8 ? encodeCWLType(t) : head(tail(typesList)).tag === /* Array */
-  11 ? (arraySchema = head(tail(typesList)).fields[0], matchValue = arraySchema.Items, matchValue.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue.tag === /* Boolean */
-  8 ? encodeCWLType(t) : encodeCWLType(t)) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : !isEmpty(tail(typesList)) ? head(tail(typesList)).tag === /* Null */
-  10 ? isEmpty(tail(tail(typesList))) ? head(typesList).tag === /* File */
-  0 ? encodeCWLType(t) : head(typesList).tag === /* Directory */
-  1 ? encodeCWLType(t) : head(typesList).tag === /* String */
-  3 ? encodeCWLType(t) : head(typesList).tag === /* Int */
-  4 ? encodeCWLType(t) : head(typesList).tag === /* Long */
-  5 ? encodeCWLType(t) : head(typesList).tag === /* Float */
-  6 ? encodeCWLType(t) : head(typesList).tag === /* Double */
-  7 ? encodeCWLType(t) : head(typesList).tag === /* Boolean */
-  8 ? encodeCWLType(t) : head(typesList).tag === /* Array */
-  11 ? (arraySchema = head(typesList).fields[0], matchValue = arraySchema.Items, matchValue.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue.tag === /* Boolean */
-  8 ? encodeCWLType(t) : encodeCWLType(t)) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t) : encodeCWLType(t)) : t.tag === /* Array */
-  11 ? (arraySchema_1 = t.fields[0], matchValue_1 = arraySchema_1.Items, matchValue_1.tag === /* File */
-  0 ? encodeCWLType(t) : matchValue_1.tag === /* Directory */
-  1 ? encodeCWLType(t) : matchValue_1.tag === /* Dirent */
-  2 ? encodeCWLType(t) : matchValue_1.tag === /* String */
-  3 ? encodeCWLType(t) : matchValue_1.tag === /* Int */
-  4 ? encodeCWLType(t) : matchValue_1.tag === /* Long */
-  5 ? encodeCWLType(t) : matchValue_1.tag === /* Float */
-  6 ? encodeCWLType(t) : matchValue_1.tag === /* Double */
-  7 ? encodeCWLType(t) : matchValue_1.tag === /* Boolean */
-  8 ? encodeCWLType(t) : yMap(singleton(["type", encodeInputArraySchema(arraySchema_1)]))) : t.tag === /* Record */
-  12 ? yMap(singleton(["type", encodeInputRecordSchema(t.fields[0])])) : t.tag === /* Enum */
-  13 ? yMap(singleton(["type", encodeInputEnumSchema(t.fields[0])])) : encodeCWLType(t)) : void 0;
-  const acc_1 = empty$1();
-  acc_2 = value$1 == null ? acc_1 : append(acc_1, singleton(["type", value(value$1)]));
-  const value_3 = i.Label;
+  let encoder;
+  const source = i.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = i.Label;
+  const acc_1 = empty();
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_1)]));
+  const value_3 = i.SecondaryFiles;
   const acc_3 = acc_2;
-  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["label", string(value(value_3))]));
-  const value_5 = i.SecondaryFiles;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["secondaryFiles", rawYamlNode(value_3)]));
+  const value_6 = i.Streamable;
   const acc_5 = acc_4;
-  acc_6 = value_5 == null ? acc_5 : append(acc_5, singleton(["secondaryFiles", value(value_5)]));
-  const value_7 = i.Streamable;
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["streamable", encodeSchemaSaladBool(value_6)]));
+  let encoder_4;
+  const source_1 = i.SourceNodes.Doc;
+  encoder_4 = (doc) => encodeDocValue(source_1, doc);
+  const value_8 = i.Doc;
   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;
+  acc_8 = value_8 == null ? acc_7 : append(acc_7, singleton(["doc", encoder_4(value_8)]));
+  const value_10 = i.Format;
   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;
+  acc_10 = value_10 == null ? acc_9 : append(acc_9, singleton(["format", encodeInputFormat(value_10)]));
+  const value_13 = i.LoadContents;
   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;
+  acc_12 = value_13 == null ? acc_11 : append(acc_11, singleton(["loadContents", encodeSchemaSaladBool(value_13)]));
+  const value_16 = i.LoadListing;
   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;
+  acc_14 = value_16 == null ? acc_13 : append(acc_13, singleton(["loadListing", encodeLoadListing(value_16)]));
+  const value_18 = i.DefaultValue;
   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;
+  acc_16 = value_18 == null ? acc_15 : append(acc_15, singleton(["default", rawYamlNode(value_18)]));
+  const value_20 = i.InputBinding;
   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 = void 0, t_1 = void 0;
-  if (!isEmpty(pairs)) {
-    if (head(pairs)[0] === "type") {
-      if (isEmpty(tail(pairs))) {
-        matchResult = 0;
-        t_1 = head(pairs)[1];
-      } else {
-        matchResult = 1;
-      }
-    } else {
-      matchResult = 1;
-    }
-  } else {
-    matchResult = 1;
-  }
-  switch (matchResult) {
-    case 0:
-      return [i.Name, t_1];
-    default:
-      return [i.Name, yMap(pairs)];
-  }
+  acc_18 = value_20 == null ? acc_17 : append(acc_17, singleton(["inputBinding", encodeListEntry(encodeInputBinding, value_20)]));
+  otherPairs = appendDynamicPropertiesExcept(CWLInput.KnownFieldNames, i, acc_18);
+  return encodePortEntry(i.Name, i.Type_, otherPairs);
 }
-function encodeSchemaDefRequirementType(s) {
-  let acc = void 0;
-  return yMap((acc = ofArray([["name", string(s.Name)], ["type", encodeCWLType(s.Type_)]]), appendDynamicPropertiesExcept(SchemaDefRequirementType.KnownFieldNames, s, acc)));
+function encodeSchemaDefinition(definition) {
+  const patternInput = partition((tupledArg) => tupledArg[0] === "name", definition.tag === /* Enum */
+  1 ? inputEnumSchemaPairs(definition.fields[0]) : definition.tag === /* Array */
+  2 ? inputArraySchemaPairs(definition.fields[0]) : inputRecordSchemaPairs(definition.fields[0]));
+  return encodeObject(append(patternInput[0], patternInput[1]));
 }
 function encodeRequirement(r) {
   let acc_17 = void 0, acc_15 = void 0, acc_13 = void 0, acc_11 = void 0, acc_9 = void 0, acc_7 = void 0, acc_5 = void 0, acc_3 = void 0, value_5 = void 0, acc_4 = void 0, value_8 = void 0, acc_6 = void 0, value_11 = void 0, acc_8 = void 0, value_14 = void 0, acc_10 = void 0, value_17 = void 0, acc_12 = void 0, value_20 = void 0, acc_14 = void 0, value_23 = void 0, acc_16 = void 0, acc_24 = void 0, acc_32 = void 0, acc_33 = void 0, acc_34 = void 0, acc_2 = void 0, value_2 = void 0, option_1 = void 0, entries = void 0, acc_1 = void 0;
@@ -862,74 +1425,121 @@ function encodeRequirement(r) {
     case /* SchemaDefRequirement */
     1: {
       const types = r.fields[0];
-      return yMap(ofArray([["class", string("SchemaDefRequirement")], ["types", YAMLElement_Sequence(ofSeq(map$1(encodeSchemaDefRequirementType, types)))]]));
+      return encodeObject(ofArray([["class", encodeString("SchemaDefRequirement")], ["types", encodeSequence(ofSeq(map$1((entry) => {
+        switch (entry.tag) {
+          case /* Imported */
+          1:
+            return directive("$import", entry.fields[0]);
+          case /* Mixed */
+          2:
+            return entry.fields[0].Node;
+          case /* Raw */
+          3:
+            return entry.fields[0].Node;
+          default:
+            return encodeSchemaDefinition(entry.fields[0]);
+        }
+      }, types)))]]));
     }
     case /* DockerRequirement */
     2: {
       const dr = r.fields[0];
-      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$1(string, value(value_23))))]))), appendDynamicPropertiesExcept(DockerRequirement.KnownFieldNames, dr, acc_17)));
+      return encodeObject((acc_17 = (acc_15 = (acc_13 = (acc_11 = (acc_9 = (acc_7 = (acc_5 = (acc_3 = singleton(["class", encodeString("DockerRequirement")]), value_5 = dr.DockerPull, acc_4 = acc_3, value_5 == null ? acc_4 : append(acc_4, singleton(["dockerPull", encodeSchemaSaladString(value_5)]))), value_8 = dr.DockerFile, acc_6 = acc_5, value_8 == null ? acc_6 : append(acc_6, singleton(["dockerFile", encodeSchemaSaladString(value_8)]))), value_11 = dr.DockerImageId, acc_8 = acc_7, value_11 == null ? acc_8 : append(acc_8, singleton(["dockerImageId", encodeSchemaSaladString(value_11)]))), value_14 = dr.DockerLoad, acc_10 = acc_9, value_14 == null ? acc_10 : append(acc_10, singleton(["dockerLoad", encodeSchemaSaladString(value_14)]))), value_17 = dr.DockerImport, acc_12 = acc_11, value_17 == null ? acc_12 : append(acc_12, singleton(["dockerImport", encodeSchemaSaladString(value_17)]))), value_20 = dr.DockerOutputDirectory, acc_14 = acc_13, value_20 == null ? acc_14 : append(acc_14, singleton(["dockerOutputDirectory", encodeSchemaSaladString(value_20)]))), value_23 = dr.DockerRunOptions, acc_16 = acc_15, value_23 == null ? acc_16 : append(acc_16, singleton(["cwltool:dockerRunOptions", encodeSequence(ofSeq(map$1(encodeString, 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$1((p) => {
+      return encodeObject(ofArray([["class", encodeString("SoftwareRequirement")], ["packages", encodeSequence(ofSeq(map$1((entry_1) => encodeListEntry((p) => {
         let acc_23 = void 0, acc_21 = void 0, acc_19 = void 0, value_26 = void 0, acc_20 = void 0, value_29 = void 0, acc_22 = void 0;
-        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$1(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$1(string, value(value_29))))]))), appendDynamicPropertiesExcept(SoftwarePackage.KnownFieldNames, p, acc_23)));
-      }, pkgs)))]]));
+        return encodeObject((acc_23 = (acc_21 = (acc_19 = append(empty(), singleton(["package", encodeSchemaSaladString(p.Package)])), value_26 = p.Version, acc_20 = acc_19, value_26 == null ? acc_20 : append(acc_20, singleton(["version", encodeSequence(ofSeq(map$1(encodeSchemaSaladString, value_26)))]))), value_29 = p.Specs, acc_22 = acc_21, value_29 == null ? acc_22 : append(acc_22, singleton(["specs", encodeSequence(ofSeq(map$1(encodeSchemaSaladString, value_29)))]))), appendDynamicPropertiesExcept(SoftwarePackage.KnownFieldNames, p, acc_23)));
+      }, entry_1), pkgs)))]]));
     }
     case /* LoadListingRequirement */
     4: {
       const loadListing = r.fields[0];
-      return yMap((acc_24 = ofArray([["class", string("LoadListingRequirement")], ["loadListing", string(LoadListingEnum_get_toCwlString()(loadListing.LoadListing))]]), appendDynamicPropertiesExcept(LoadListingRequirementValue.KnownFieldNames, loadListing, acc_24)));
+      return encodeObject((acc_24 = ofArray([["class", encodeString("LoadListingRequirement")], ["loadListing", encodeLoadListing(loadListing.LoadListing)]]), appendDynamicPropertiesExcept(LoadListingRequirementValue.KnownFieldNames, loadListing, acc_24)));
     }
     case /* InitialWorkDirRequirement */
     5: {
       const listing = r.fields[0];
-      return yMap(ofArray([["class", string("InitialWorkDirRequirement")], ["listing", YAMLElement_Sequence(ofSeq(map$1((_arg) => {
-        let acc_30 = void 0, acc_28 = void 0, value_32 = void 0, acc_26 = void 0, value_34 = void 0, acc_29 = void 0;
+      const encodeFileOrDirectory = (_arg) => {
         switch (_arg.tag) {
+          case /* DirectoryItem */
+          1:
+            return encodeObject(encodeDirectoryPairs("class", "Directory", _arg.fields[0]));
+          case /* ImportedItem */
+          2:
+            return directive("$import", _arg.fields[0]);
+          case /* MixedItem */
+          3:
+            return _arg.fields[0].Node;
+          case /* RawItem */
+          4:
+            return _arg.fields[0].Node;
+          default:
+            return encodeObject(encodeFilePairs("class", "File", _arg.fields[0]));
+        }
+      };
+      return encodeObject(ofArray([["class", encodeString("InitialWorkDirRequirement")], ["listing", encodeSequence(ofSeq(map$1((_arg_1) => {
+        let acc_30 = void 0, acc_28 = void 0, value_32 = void 0, acc_26 = void 0, value_35 = void 0, acc_29 = void 0;
+        switch (_arg_1.tag) {
           case /* StringEntry */
           1:
-            return encodeSchemaSaladString(_arg.fields[0]);
+            return encodeSchemaSaladString(_arg_1.fields[0]);
           case /* FileEntry */
           2:
-            return yMap(encodeFilePairs("class", "File", _arg.fields[0]));
+            return encodeFileOrDirectory(FileOrDirectory_FileItem(_arg_1.fields[0]));
           case /* DirectoryEntry */
           3:
-            return yMap(encodeDirectoryPairs("class", "Directory", _arg.fields[0]));
+            return encodeFileOrDirectory(FileOrDirectory_DirectoryItem(_arg_1.fields[0]));
+          case /* NullEntry */
+          4:
+            return Encode_nullValue;
+          case /* FilesEntry */
+          5:
+            return encodeSequence(ofSeq(map$1(encodeFileOrDirectory, _arg_1.fields[0])));
+          case /* RawEntry */
+          6:
+            return _arg_1.fields[0].Node;
           default: {
-            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)));
+            const d = _arg_1.fields[0];
+            return encodeObject((acc_30 = (acc_28 = append((value_32 = d.Entryname, acc_26 = empty(), value_32 == null ? acc_26 : append(acc_26, singleton(["entryname", encodeSchemaSaladString(value_32)]))), singleton(["entry", encodeSchemaSaladString(d.Entry)])), value_35 = d.Writable, acc_29 = acc_28, value_35 == null ? acc_29 : append(acc_29, singleton(["writable", encodeSchemaSaladBool(value_35)]))), appendDynamicPropertiesExcept(DirentInstance.KnownFieldNames, d, acc_30)));
           }
         }
       }, listing)))]]));
     }
-    case /* EnvVarRequirement */
+    case /* InitialWorkDirExpressionRequirement */
     6: {
+      const expression = r.fields[0];
+      return encodeObject(ofArray([["class", encodeString("InitialWorkDirRequirement")], ["listing", encodeSchemaSaladString(expression)]]));
+    }
+    case /* EnvVarRequirement */
+    7: {
       const envs = r.fields[0];
-      return yMap(ofArray([["class", string("EnvVarRequirement")], ["envDef", YAMLElement_Sequence(ofSeq(map$1((e) => {
+      return encodeObject(ofArray([["class", encodeString("EnvVarRequirement")], ["envDef", encodeSequence(ofSeq(map$1((entry_2) => encodeListEntry((e) => {
         let acc_31 = void 0;
-        const v_12 = normalizeEnvValueForEncode(e.EnvValue);
-        return yMap((acc_31 = ofArray([["envName", string(e.EnvName)], ["envValue", string(v_12)]]), appendDynamicPropertiesExcept(EnvironmentDef.KnownFieldNames, e, acc_31)));
-      }, envs)))]]));
+        return encodeObject((acc_31 = ofArray([["envName", encodeSchemaSaladString(e.EnvName)], ["envValue", encodeSchemaSaladString(e.EnvValue)]]), appendDynamicPropertiesExcept(EnvironmentDef.KnownFieldNames, e, acc_31)));
+      }, entry_2), envs)))]]));
     }
     case /* ShellCommandRequirement */
-    7:
-      return yMap(singleton(["class", string("ShellCommandRequirement")]));
+    8:
+      return encodeObject(singleton(["class", encodeString("ShellCommandRequirement")]));
     case /* ResourceRequirement */
-    8: {
+    9: {
       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 === "string") {
-          return [key, string(value_35)];
-        } else if (typeof value_35 === "boolean") {
-          return [key, yBool(value_35)];
+      const tryEncodeScalar = (key, value_36) => {
+        if (typeof value_36 === "number") {
+          return [key, Encode_float(value_36)];
+        } else if (typeof value_36 === "number") {
+          return [key, Encode_int(value_36)];
+        } else if (typeof value_36 === "bigint") {
+          return [key, Encode_int64(value_36)];
+        } else if (typeof value_36 === "string") {
+          return [key, encodeString(value_36)];
+        } else if (value_36 instanceof SchemaSaladString) {
+          return [key, encodeSchemaSaladString(value_36)];
+        } else if (typeof value_36 === "boolean") {
+          return [key, Encode_bool(value_36)];
         } else {
           return void 0;
         }
@@ -949,82 +1559,199 @@ function encodeRequirement(r) {
       }, dynamicPropertiesExcept(ofSeq$1(map$1((x) => x, ResourceRequirementInstance.KnownFieldNames), {
         Compare: (x_1, y) => comparePrimitives(x_1, y) | 0
       }), rr)));
-      return yMap(append(singleton(["class", string("ResourceRequirement")]), append(knownPairs, dynamicPairs)));
+      return encodeObject(append(singleton(["class", encodeString("ResourceRequirement")]), append(knownPairs, dynamicPairs)));
     }
     case /* WorkReuseRequirement */
-    9: {
+    10: {
       const workReuse = r.fields[0];
-      return yMap((acc_32 = ofArray([["class", string("WorkReuse")], ["enableReuse", yBool(workReuse.EnableReuse)]]), appendDynamicPropertiesExcept(WorkReuseRequirementValue.KnownFieldNames, workReuse, acc_32)));
+      return encodeObject((acc_32 = ofArray([["class", encodeString("WorkReuse")], ["enableReuse", Encode_bool(workReuse.EnableReuse)]]), appendDynamicPropertiesExcept(WorkReuseRequirementValue.KnownFieldNames, workReuse, acc_32)));
     }
     case /* WorkReuseExpressionRequirement */
-    10: {
-      const expression = r.fields[0];
-      return yMap(ofArray([["class", string("WorkReuse")], ["enableReuse", string(expression)]]));
+    11: {
+      const expression_1 = r.fields[0];
+      return encodeObject(ofArray([["class", encodeString("WorkReuse")], ["enableReuse", encodeSchemaSaladString(expression_1)]]));
     }
     case /* NetworkAccessRequirement */
-    11: {
+    12: {
       const networkAccess = r.fields[0];
-      return yMap((acc_33 = ofArray([["class", string("NetworkAccess")], ["networkAccess", yBool(networkAccess.NetworkAccess)]]), appendDynamicPropertiesExcept(NetworkAccessRequirementValue.KnownFieldNames, networkAccess, acc_33)));
+      return encodeObject((acc_33 = ofArray([["class", encodeString("NetworkAccess")], ["networkAccess", Encode_bool(networkAccess.NetworkAccess)]]), appendDynamicPropertiesExcept(NetworkAccessRequirementValue.KnownFieldNames, networkAccess, acc_33)));
     }
     case /* NetworkAccessExpressionRequirement */
-    12: {
-      const expression_1 = r.fields[0];
-      return yMap(ofArray([["class", string("NetworkAccess")], ["networkAccess", string(expression_1)]]));
+    13: {
+      const expression_2 = r.fields[0];
+      return encodeObject(ofArray([["class", encodeString("NetworkAccess")], ["networkAccess", encodeSchemaSaladString(expression_2)]]));
     }
     case /* InplaceUpdateRequirement */
-    13: {
+    14: {
       const inplaceUpdate = r.fields[0];
-      return yMap((acc_34 = ofArray([["class", string("InplaceUpdateRequirement")], ["inplaceUpdate", yBool(inplaceUpdate.InplaceUpdate)]]), appendDynamicPropertiesExcept(InplaceUpdateRequirementValue.KnownFieldNames, inplaceUpdate, acc_34)));
+      return encodeObject((acc_34 = ofArray([["class", encodeString("InplaceUpdateRequirement")], ["inplaceUpdate", encodeSchemaSaladBool(inplaceUpdate.InplaceUpdate)]]), appendDynamicPropertiesExcept(InplaceUpdateRequirementValue.KnownFieldNames, inplaceUpdate, acc_34)));
     }
     case /* ToolTimeLimitRequirement */
-    14: {
+    15: {
       const tl = r.fields[0];
       const timelimit = tl.tag === /* ToolTimeLimitExpression */
-      1 ? string(tl.fields[0]) : YAMLElement_Value(YAMLContent_create_Z1C3A29C9(int64ToString(tl.fields[0])));
-      return yMap(ofArray([["class", string("ToolTimeLimit")], ["timelimit", timelimit]]));
+      1 ? encodeSchemaSaladString(tl.fields[0]) : Encode_int64(tl.fields[0]);
+      return encodeObject(ofArray([["class", encodeString("ToolTimeLimit")], ["timelimit", timelimit]]));
     }
     case /* SubworkflowFeatureRequirement */
-    15:
-      return yMap(singleton(["class", string("SubworkflowFeatureRequirement")]));
-    case /* ScatterFeatureRequirement */
     16:
-      return yMap(singleton(["class", string("ScatterFeatureRequirement")]));
-    case /* MultipleInputFeatureRequirement */
+      return encodeObject(singleton(["class", encodeString("SubworkflowFeatureRequirement")]));
+    case /* ScatterFeatureRequirement */
     17:
-      return yMap(singleton(["class", string("MultipleInputFeatureRequirement")]));
-    case /* StepInputExpressionRequirement */
+      return encodeObject(singleton(["class", encodeString("ScatterFeatureRequirement")]));
+    case /* MultipleInputFeatureRequirement */
     18:
-      return yMap(singleton(["class", string("StepInputExpressionRequirement")]));
+      return encodeObject(singleton(["class", encodeString("MultipleInputFeatureRequirement")]));
+    case /* StepInputExpressionRequirement */
+    19:
+      return encodeObject(singleton(["class", encodeString("StepInputExpressionRequirement")]));
+    case /* ImportedRequirement */
+    20:
+      return directive("$import", r.fields[0]);
+    case /* MixedRequirement */
+    21:
+      return r.fields[0].Node;
+    case /* RawRequirement */
+    22:
+      return r.fields[0].Node;
     default: {
-      const value$1 = r.fields[0];
-      return yMap((acc_2 = (value_2 = (option_1 = value$1.ExpressionLib, option_1 != null ? (entries = value(option_1), entries.length > 0 ? entries : void 0) : void 0), acc_1 = singleton(["class", string("InlineJavascriptRequirement")]), value_2 == null ? acc_1 : append(acc_1, singleton(["expressionLib", YAMLElement_Sequence(ofSeq(map$1(string, value(value_2))))]))), appendDynamicPropertiesExcept(InlineJavascriptRequirementValue.KnownFieldNames, value$1, acc_2)));
+      const value = r.fields[0];
+      return encodeObject((acc_2 = (value_2 = (option_1 = value.ExpressionLib, option_1 != null ? (entries = option_1, entries.length > 0 ? entries : void 0) : void 0), acc_1 = singleton(["class", encodeString("InlineJavascriptRequirement")]), value_2 == null ? acc_1 : append(acc_1, singleton(["expressionLib", encodeSequence(ofSeq(map$1(encodeSchemaSaladString, value_2)))]))), appendDynamicPropertiesExcept(InlineJavascriptRequirementValue.KnownFieldNames, value, acc_2)));
     }
   }
 }
 function encodeHintEntry(hint) {
-  if (hint.tag === /* UnknownHint */
-  1) {
-    const unknownHint = hint.fields[0];
-    return unknownHint.Raw;
+  switch (hint.tag) {
+    case /* UnknownHint */
+    1: {
+      const unknownHint = hint.fields[0];
+      return unknownHint.Raw.Node;
+    }
+    case /* ImportedHint */
+    2:
+      return directive("$import", hint.fields[0]);
+    case /* MixedHint */
+    3:
+      return hint.fields[0].Node;
+    case /* RawHint */
+    4:
+      return hint.fields[0].Node;
+    default:
+      return encodeRequirement(hint.fields[0]);
+  }
+}
+function encodeEntryList(whole, encodeEntry, importedPath, entries) {
+  const matchValue = toList(entries);
+  let matchResult = void 0, single_1 = void 0;
+  if (whole) {
+    if (!isEmpty(matchValue)) {
+      if (isEmpty(tail(matchValue))) {
+        if (importedPath(head(matchValue)) != null) {
+          matchResult = 0;
+          single_1 = head(matchValue);
+        } else {
+          matchResult = 1;
+        }
+      } else {
+        matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+  } else {
+    matchResult = 1;
+  }
+  switch (matchResult) {
+    case 0:
+      return directive("$import", value(importedPath(single_1)));
+    default:
+      return encodeSequence(ofSeq(map$1(encodeEntry, entries)));
+  }
+}
+function importedRequirementPath(requirement) {
+  if (requirement.tag === /* ImportedRequirement */
+  20) {
+    return requirement.fields[0];
+  } else {
+    return void 0;
+  }
+}
+function importedHintPath(hint) {
+  if (hint.tag === /* ImportedHint */
+  2) {
+    return hint.fields[0];
   } else {
-    return encodeRequirement(hint.fields[0]);
+    return void 0;
   }
 }
+function encodeHintsField(sourceNodes, hints) {
+  return encodeEntryList(FSharpSet__Contains(sourceNodes.WholeFields, "hints"), encodeHintEntry, importedHintPath, hints);
+}
+function encodeRequirementsField(sourceNodes, requirements) {
+  return encodeEntryList(FSharpSet__Contains(sourceNodes.WholeFields, "requirements"), encodeRequirement, importedRequirementPath, requirements);
+}
 function encodeSourceArray(sources) {
-  if (sources.length === 1) {
-    return string(item(0, sources));
+  if (sources.tag === /* Multiple */
+  1) {
+    return YamlNodeModule_sequence(ofSeq(map$1((s) => YamlNodeModule_item(encodeSchemaSaladString(s)), sources.fields[0])));
   } else {
-    return YAMLElement_Sequence(ofSeq(map$1((s) => YAMLElement_Object$(singleton(YAMLElement_Value(YAMLContent_create_Z1C3A29C9(s)))), sources)));
+    return encodeSchemaSaladString(sources.fields[0]);
+  }
+}
+function encodeLinkMergeMethod(linkMerge) {
+  switch (linkMerge.tag) {
+    case /* IncludedLinkMerge */
+    3:
+      return directive("$include", linkMerge.fields[0]);
+    case /* MixedLinkMerge */
+    4:
+      return linkMerge.fields[0].Node;
+    case /* MergeNested */
+    0:
+    case /* MergeFlattened */
+    1:
+      return encodeString(linkMerge.AsCwlString);
+    default:
+      return directive("$import", linkMerge.fields[0]);
   }
 }
-function encodeLinkMergeMethod(linkMerge) {
-  return string(linkMerge.AsCwlString);
-}
 function encodePickValueMethod(pickValue) {
-  return string(pickValue.AsCwlString);
+  switch (pickValue.tag) {
+    case /* IncludedPickValue */
+    4:
+      return directive("$include", pickValue.fields[0]);
+    case /* MixedPickValue */
+    5:
+      return pickValue.fields[0].Node;
+    case /* FirstNonNull */
+    0:
+    case /* TheOnlyNonNull */
+    1:
+    case /* AllNonNull */
+    2:
+      return encodeString(pickValue.AsCwlString);
+    default:
+      return directive("$import", pickValue.fields[0]);
+  }
 }
 function encodeScatterMethod(scatterMethod) {
-  return string(scatterMethod.AsCwlString);
+  switch (scatterMethod.tag) {
+    case /* IncludedScatterMethod */
+    4:
+      return directive("$include", scatterMethod.fields[0]);
+    case /* MixedScatterMethod */
+    5:
+      return scatterMethod.fields[0].Node;
+    case /* DotProduct */
+    0:
+    case /* NestedCrossProduct */
+    1:
+    case /* FlatCrossProduct */
+    2:
+      return encodeString(scatterMethod.AsCwlString);
+    default:
+      return directive("$import", scatterMethod.fields[0]);
+  }
 }
 function encodeStepInput(si) {
   let pairs;
@@ -1038,38 +1765,45 @@ function encodeStepInput(si) {
   let acc_4;
   let acc_2;
   const value_1 = si.Source;
-  const acc_1 = empty$1();
-  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["source", encodeSourceArray(value(value_1))]));
+  const acc_1 = empty();
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["source", encodeSourceArray(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)]));
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["default", rawYamlNode(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))]));
+  acc_6 = value_6 == null ? acc_5 : append(acc_5, singleton(["valueFrom", encodeSchemaSaladString(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))]));
+  acc_8 = value_8 == null ? acc_7 : append(acc_7, singleton(["linkMerge", encodeLinkMergeMethod(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;
+  acc_10 = value_10 == null ? acc_9 : append(acc_9, singleton(["pickValue", encodePickValueMethod(value_10)]));
+  let encoder_5;
+  const source = si.SourceNodes.Doc;
+  encoder_5 = (doc) => encodeDocValue(source, doc);
+  const value_12 = si.Doc;
   const acc_11 = acc_10;
-  acc_12 = value_13 == null ? acc_11 : append(acc_11, singleton(["doc", string(value(value_13))]));
+  acc_12 = value_12 == null ? acc_11 : append(acc_11, singleton(["doc", encoder_5(value_12)]));
   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))]));
+  acc_14 = value_15 == null ? acc_13 : append(acc_13, singleton(["loadContents", encodeSchemaSaladBool(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;
+  acc_16 = value_18 == null ? acc_15 : append(acc_15, singleton(["loadListing", encodeLoadListing(value_18)]));
+  let encoder_9;
+  const source_1 = si.SourceNodes.Label;
+  encoder_9 = (label) => encodeLabelValue(source_1, label);
+  const value_20 = si.Label;
   const acc_17 = acc_16;
-  acc_18 = value_21 == null ? acc_17 : append(acc_17, singleton(["label", string(value(value_21))]));
+  acc_18 = value_20 == null ? acc_17 : append(acc_17, singleton(["label", encoder_9(value_20)]));
   pairs = appendDynamicPropertiesExcept(StepInput.KnownFieldNames, si, acc_18);
   let matchResult = void 0, s_1 = void 0;
   if (!isEmpty(pairs)) {
     if (head(pairs)[0] === "source") {
       if (isEmpty(tail(pairs))) {
-        if (si.DefaultValue == null && si.ValueFrom == null && si.LinkMerge == null && si.PickValue == null && si.Doc == null && si.LoadContents == null && si.LoadListing == null && si.Label == null) {
+        if (!(head(pairs)[1].Kind.tag === /* Mapping */
+        1) && si.DefaultValue == null && si.ValueFrom == null && si.LinkMerge == null && si.PickValue == null && si.Doc == null && si.LoadContents == null && si.LoadListing == null && si.Label == null) {
           matchResult = 0;
           s_1 = head(pairs)[1];
         } else {
@@ -1088,115 +1822,166 @@ function encodeStepInput(si) {
     case 0:
       return [si.Id, s_1];
     default:
-      return [si.Id, yMap(pairs)];
+      return [si.Id, encodeObject(pairs)];
   }
 }
-function encodeStepInputs(inputs) {
-  return yMap(toList(map$1(encodeStepInput, inputs)));
+function encodeStepInputs(whole, inputs) {
+  return encodeIdEntries("id", "source", whole, toList(map$1((entry) => ListEntry$1.map(encodeStepInput, entry), inputs)));
 }
 function encodeStepOutputParameter(so) {
   let acc = void 0;
-  return yMap((acc = singleton(["id", string(so.Id)]), appendDynamicPropertiesExcept(StepOutputParameter.KnownFieldNames, so, acc)));
-}
-function encodeStepOutputs(outputs) {
-  return YAMLElement_Sequence(ofSeq(map$1((output) => {
-    if (output.tag === /* StepOutputRecord */
-    1) {
-      return encodeStepOutputParameter(output.fields[0]);
+  return encodeObject((acc = singleton(["id", encodeString(so.Id)]), appendDynamicPropertiesExcept(StepOutputParameter.KnownFieldNames, so, acc)));
+}
+function encodeStepOutputs(whole, outputs) {
+  const matchValue = toList(outputs);
+  let matchResult = void 0, path = void 0;
+  if (whole) {
+    if (!isEmpty(matchValue)) {
+      if (head(matchValue).tag === /* StepOutputImport */
+      3) {
+        if (isEmpty(tail(matchValue))) {
+          matchResult = 0;
+          path = head(matchValue).fields[0];
+        } else {
+          matchResult = 1;
+        }
+      } else {
+        matchResult = 1;
+      }
     } else {
-      return string(output.fields[0]);
+      matchResult = 1;
     }
-  }, outputs)));
+  } else {
+    matchResult = 1;
+  }
+  switch (matchResult) {
+    case 0:
+      return directive("$import", path);
+    default:
+      return encodeSequence(ofSeq(map$1((output) => {
+        switch (output.tag) {
+          case /* StepOutputRecord */
+          1:
+            return encodeStepOutputParameter(output.fields[0]);
+          case /* StepOutputInclude */
+          2:
+            return directive("$include", output.fields[0]);
+          case /* StepOutputImport */
+          3:
+            return directive("$import", output.fields[0]);
+          case /* StepOutputMixed */
+          4:
+            return output.fields[0].Node;
+          default:
+            return encodeString(output.fields[0]);
+        }
+      }, outputs)));
+  }
 }
 function encodeScatter(scatter) {
   if (scatter.length === 1) {
-    return string(item(0, scatter));
+    return encodeSchemaSaladString(item(0, scatter));
   } else {
-    return YAMLElement_Sequence(ofSeq(map$1(string, scatter)));
+    return encodeSequence(ofSeq(map$1(encodeSchemaSaladString, scatter)));
   }
 }
-function encodeWorkflowStepRun(run) {
+function encodeRunWithin(ancestors, run) {
   switch (run.tag) {
+    case /* RunImport */
+    1:
+      return directive("$import", run.fields[0]);
+    case /* RunMixed */
+    2:
+      return run.fields[0].Node;
+    case /* RunRaw */
+    3:
+      return run.fields[0].Node;
     case /* RunCommandLineTool */
-    1: {
+    4: {
       const toolObj = run.fields[0];
       const matchValue = WorkflowStepRunOps_tryGetTool(run);
       if (matchValue == null) {
         throw ArgumentException_$ctor_Z721C83C5(`RunCommandLineTool must contain CWLToolDescription but got ${interpolate("%A%P()", [toolObj])}`);
       } else {
-        return encodeToolDescriptionElement(value(matchValue));
+        return encodeToolDescriptionElement(matchValue);
       }
     }
     case /* RunWorkflow */
-    2: {
+    5: {
       const workflowObj = run.fields[0];
       const matchValue_1 = WorkflowStepRunOps_tryGetWorkflow(run);
       if (matchValue_1 == null) {
         throw ArgumentException_$ctor_Z721C83C5(`RunWorkflow must contain CWLWorkflowDescription but got ${interpolate("%A%P()", [workflowObj])}`);
       } else {
-        return encodeWorkflowDescriptionElement(value(matchValue_1));
+        return encodeWorkflowWithin(ancestors, matchValue_1);
       }
     }
     case /* RunExpressionTool */
-    3: {
+    6: {
       const expressionToolObj = run.fields[0];
       const matchValue_2 = WorkflowStepRunOps_tryGetExpressionTool(run);
       if (matchValue_2 == null) {
         throw ArgumentException_$ctor_Z721C83C5(`RunExpressionTool must contain CWLExpressionToolDescription but got ${interpolate("%A%P()", [expressionToolObj])}`);
       } else {
-        return encodeExpressionToolDescriptionElement(value(matchValue_2));
+        return encodeExpressionToolDescriptionElement(matchValue_2);
       }
     }
     case /* RunOperation */
-    4: {
+    7: {
       const operationObj = run.fields[0];
       const matchValue_3 = WorkflowStepRunOps_tryGetOperation(run);
       if (matchValue_3 == null) {
         throw ArgumentException_$ctor_Z721C83C5(`RunOperation must contain CWLOperationDescription but got ${interpolate("%A%P()", [operationObj])}`);
       } else {
-        return encodeOperationDescriptionElement(value(matchValue_3));
+        return encodeOperationDescriptionElement(matchValue_3);
       }
     }
     default:
-      return string(run.fields[0]);
+      return encodeString(run.fields[0]);
   }
 }
 function encodeToolDescriptionElement(td) {
-  let intent = void 0, h = void 0, r = void 0, bc = void 0, matchValue_3 = void 0, i = void 0, i_1 = void 0;
+  let intent = void 0, h = void 0, r = void 0, bc = void 0, acc_20 = void 0, acc_18 = void 0, acc_16 = void 0, acc_14 = void 0, acc_12 = void 0, acc_10 = void 0, value_6 = void 0, acc_9 = void 0, value_9 = void 0, acc_11 = void 0, value_12 = void 0, acc_13 = void 0, value_15 = void 0, acc_15 = void 0, encoder_8 = void 0, whole_1 = void 0, value_17 = void 0, acc_17 = void 0, encoder_10 = void 0, whole_2 = void 0, value_19 = void 0, acc_19 = void 0, encoder_12 = void 0, whole_3 = void 0, value_21 = void 0, acc_21 = void 0, entries = void 0, entries_1 = void 0;
   let basePairs;
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = ofArray([["cwlVersion", string(td.CWLVersion)], ["class", string("CommandLineTool")]]);
+  const acc = ofArray([["cwlVersion", encodeString(td.CWLVersion)], ["class", encodeString("CommandLineTool")]]);
   let pairOpt_1;
   const option_1 = td.Id;
-  pairOpt_1 = option_1 != null ? ["id", string(value(option_1))] : void 0;
+  pairOpt_1 = option_1 != null ? ["id", encodeString(option_1)] : void 0;
   const acc_1 = acc;
-  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(value(pairOpt_1)));
-  let pairOpt_3;
-  const option_3 = td.Label;
-  pairOpt_3 = option_3 != null ? encodeLabel(value(option_3)) : void 0;
+  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(pairOpt_1));
+  let encoder;
+  const source = td.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = td.Label;
   const acc_3 = acc_2;
-  acc_4 = pairOpt_3 == null ? acc_3 : append(acc_3, singleton(value(pairOpt_3)));
-  let pairOpt_5;
-  const option_5 = td.Doc;
-  pairOpt_5 = option_5 != null ? encodeDoc(value(option_5)) : void 0;
+  acc_4 = value_1 == null ? acc_3 : append(acc_3, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = td.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeProcessDocValue(source_1, doc);
+  const value_3 = td.Doc;
   const acc_5 = acc_4;
-  acc_6 = pairOpt_5 == null ? acc_5 : append(acc_5, singleton(value(pairOpt_5)));
-  let pairOpt_7;
-  let option_9;
-  const option_7 = td.Intent;
-  option_9 = option_7 != null ? (intent = value(option_7), intent.length > 0) ? option_7 : void 0 : void 0;
-  pairOpt_7 = option_9 != null ? encodeIntent(value(option_9)) : void 0;
+  acc_6 = value_3 == null ? acc_5 : append(acc_5, singleton(["doc", encoder_2(value_3)]));
+  let pairOpt_3;
+  let option_4;
+  const option_3 = td.Intent;
+  option_4 = option_3 != null ? (intent = option_3, intent.length > 0) ? option_3 : void 0 : void 0;
+  let mapping_2;
+  const whole = FSharpSet__Contains(td.SourceNodes.WholeFields, "intent");
+  mapping_2 = (intent_1) => encodeIntent(whole, intent_1);
+  const option_5 = option_4;
+  pairOpt_3 = option_5 != null ? mapping_2(option_5) : void 0;
   const acc_7 = acc_6;
-  basePairs = pairOpt_7 == null ? acc_7 : append(acc_7, singleton(value(pairOpt_7)));
+  basePairs = pairOpt_3 == null ? acc_7 : append(acc_7, singleton(pairOpt_3));
   let withHints;
   const matchValue = td.Hints;
   let matchResult = void 0, h_1 = void 0;
   if (matchValue != null) {
-    if (h = value(matchValue), h.length > 0) {
+    if (h = matchValue, h.length > 0) {
       matchResult = 0;
-      h_1 = value(matchValue);
+      h_1 = matchValue;
     } else {
       matchResult = 1;
     }
@@ -1205,7 +1990,7 @@ function encodeToolDescriptionElement(td) {
   }
   switch (matchResult) {
     case 0: {
-      withHints = append(basePairs, singleton(["hints", YAMLElement_Sequence(ofSeq(map$1(encodeHintEntry, h_1)))]));
+      withHints = append(basePairs, singleton(["hints", encodeHintsField(td.SourceNodes, h_1)]));
       break;
     }
     default:
@@ -1215,9 +2000,9 @@ function encodeToolDescriptionElement(td) {
   const matchValue_1 = td.Requirements;
   let matchResult_1 = void 0, r_1 = void 0;
   if (matchValue_1 != null) {
-    if (r = value(matchValue_1), r.length > 0) {
+    if (r = matchValue_1, r.length > 0) {
       matchResult_1 = 0;
-      r_1 = value(matchValue_1);
+      r_1 = matchValue_1;
     } else {
       matchResult_1 = 1;
     }
@@ -1226,7 +2011,7 @@ function encodeToolDescriptionElement(td) {
   }
   switch (matchResult_1) {
     case 0: {
-      withRequirements = append(withHints, singleton(["requirements", YAMLElement_Sequence(ofSeq(map$1(encodeRequirement, r_1)))]));
+      withRequirements = append(withHints, singleton(["requirements", encodeRequirementsField(td.SourceNodes, r_1)]));
       break;
     }
     default:
@@ -1236,9 +2021,9 @@ function encodeToolDescriptionElement(td) {
   const matchValue_2 = td.BaseCommand;
   let matchResult_2 = void 0, bc_1 = void 0;
   if (matchValue_2 != null) {
-    if (bc = value(matchValue_2), bc.length > 0) {
+    if (bc = matchValue_2, bc.length > 0) {
       matchResult_2 = 0;
-      bc_1 = value(matchValue_2);
+      bc_1 = matchValue_2;
     } else {
       matchResult_2 = 1;
     }
@@ -1247,82 +2032,60 @@ function encodeToolDescriptionElement(td) {
   }
   switch (matchResult_2) {
     case 0: {
-      withBaseCommand = append(withRequirements, singleton(["baseCommand", YAMLElement_Sequence(ofSeq(map$1(string, bc_1)))]));
+      withBaseCommand = append(withRequirements, singleton(["baseCommand", encodeSequence(ofSeq(map$1(encodeSchemaSaladString, bc_1)))]));
       break;
     }
     default:
       withBaseCommand = withRequirements;
   }
-  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$1(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$1(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$1(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$1(encodeCWLInput, i_1)))]))) : withCommandFields : withCommandFields), singleton(["outputs", yMap(toList(map$1(encodeCWLOutput, td.Outputs)))]));
+  const withOutputs = append(append((acc_20 = (acc_18 = (acc_16 = (acc_14 = (acc_12 = (acc_10 = (value_6 = td.Arguments, acc_9 = withBaseCommand, value_6 == null ? acc_9 : append(acc_9, singleton(["arguments", rawYamlNode(value_6)]))), value_9 = td.Stdin, acc_11 = acc_10, value_9 == null ? acc_11 : append(acc_11, singleton(["stdin", encodeSchemaSaladString(value_9)]))), value_12 = td.Stderr, acc_13 = acc_12, value_12 == null ? acc_13 : append(acc_13, singleton(["stderr", encodeSchemaSaladString(value_12)]))), value_15 = td.Stdout, acc_15 = acc_14, value_15 == null ? acc_15 : append(acc_15, singleton(["stdout", encodeSchemaSaladString(value_15)]))), encoder_8 = (whole_1 = FSharpSet__Contains(td.SourceNodes.WholeFields, "successCodes"), (codes) => encodeIntList(whole_1, codes)), value_17 = td.SuccessCodes, acc_17 = acc_16, value_17 == null ? acc_17 : append(acc_17, singleton(["successCodes", encoder_8(value_17)]))), encoder_10 = (whole_2 = FSharpSet__Contains(td.SourceNodes.WholeFields, "temporaryFailCodes"), (codes_1) => encodeIntList(whole_2, codes_1)), value_19 = td.TemporaryFailCodes, acc_19 = acc_18, value_19 == null ? acc_19 : append(acc_19, singleton(["temporaryFailCodes", encoder_10(value_19)]))), encoder_12 = (whole_3 = FSharpSet__Contains(td.SourceNodes.WholeFields, "permanentFailCodes"), (codes_2) => encodeIntList(whole_3, codes_2)), value_21 = td.PermanentFailCodes, acc_21 = acc_20, value_21 == null ? acc_21 : append(acc_21, singleton(["permanentFailCodes", encoder_12(value_21)]))), singleton(["inputs", (entries = toList(map$1((entry) => ListEntry$1.map(encodeCWLInput, entry), defaultArg(td.Inputs, []))), encodeIdEntries("id", "type", FSharpSet__Contains(td.SourceNodes.WholeFields, "inputs"), entries))])), singleton(["outputs", (entries_1 = toList(map$1((entry_1) => ListEntry$1.map(encodeCWLOutput, entry_1), td.Outputs)), encodeIdEntries("id", "type", FSharpSet__Contains(td.SourceNodes.WholeFields, "outputs"), entries_1))]));
   let withMetadata;
-  const matchValue_4 = td.Metadata;
-  withMetadata = matchValue_4 == null ? withOutputs : appendDynamicProperties(value(matchValue_4), withOutputs);
-  return yMap(appendDynamicPropertiesExcept(CWLToolDescription.KnownFieldNames, td, withMetadata));
+  const matchValue_3 = td.Metadata;
+  withMetadata = matchValue_3 == null ? withOutputs : appendDynamicProperties(matchValue_3, withOutputs);
+  return encodeObject(appendDynamicPropertiesExcept(CWLToolDescription.KnownFieldNames, td, withMetadata));
 }
 function encodeExpressionToolDescriptionElement(et) {
-  let intent = void 0, h = void 0, r = void 0, matchValue_2 = void 0, i = void 0, i_1 = void 0;
+  let intent = void 0, h = void 0, matchValue_1 = void 0, r = void 0, r_1 = void 0, entries = void 0, entries_1 = void 0;
   let basePairs;
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = ofArray([["cwlVersion", string(et.CWLVersion)], ["class", string("ExpressionTool")]]);
+  const acc = ofArray([["cwlVersion", encodeString(et.CWLVersion)], ["class", encodeString("ExpressionTool")]]);
   let pairOpt_1;
   const option_1 = et.Id;
-  pairOpt_1 = option_1 != null ? ["id", string(value(option_1))] : void 0;
+  pairOpt_1 = option_1 != null ? ["id", encodeString(option_1)] : void 0;
   const acc_1 = acc;
-  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(value(pairOpt_1)));
-  let pairOpt_3;
-  const option_3 = et.Label;
-  pairOpt_3 = option_3 != null ? encodeLabel(value(option_3)) : void 0;
+  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(pairOpt_1));
+  let encoder;
+  const source = et.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = et.Label;
   const acc_3 = acc_2;
-  acc_4 = pairOpt_3 == null ? acc_3 : append(acc_3, singleton(value(pairOpt_3)));
-  let pairOpt_5;
-  const option_5 = et.Doc;
-  pairOpt_5 = option_5 != null ? encodeDoc(value(option_5)) : void 0;
+  acc_4 = value_1 == null ? acc_3 : append(acc_3, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = et.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeProcessDocValue(source_1, doc);
+  const value_3 = et.Doc;
   const acc_5 = acc_4;
-  acc_6 = pairOpt_5 == null ? acc_5 : append(acc_5, singleton(value(pairOpt_5)));
-  let pairOpt_7;
-  let option_9;
-  const option_7 = et.Intent;
-  option_9 = option_7 != null ? (intent = value(option_7), intent.length > 0) ? option_7 : void 0 : void 0;
-  pairOpt_7 = option_9 != null ? encodeIntent(value(option_9)) : void 0;
+  acc_6 = value_3 == null ? acc_5 : append(acc_5, singleton(["doc", encoder_2(value_3)]));
+  let pairOpt_3;
+  let option_4;
+  const option_3 = et.Intent;
+  option_4 = option_3 != null ? (intent = option_3, intent.length > 0) ? option_3 : void 0 : void 0;
+  let mapping_2;
+  const whole = FSharpSet__Contains(et.SourceNodes.WholeFields, "intent");
+  mapping_2 = (intent_1) => encodeIntent(whole, intent_1);
+  const option_5 = option_4;
+  pairOpt_3 = option_5 != null ? mapping_2(option_5) : void 0;
   const acc_7 = acc_6;
-  basePairs = pairOpt_7 == null ? acc_7 : append(acc_7, singleton(value(pairOpt_7)));
+  basePairs = pairOpt_3 == null ? acc_7 : append(acc_7, singleton(pairOpt_3));
   let withHints;
   const matchValue = et.Hints;
   let matchResult = void 0, h_1 = void 0;
   if (matchValue != null) {
-    if (h = value(matchValue), h.length > 0) {
+    if (h = matchValue, h.length > 0) {
       matchResult = 0;
-      h_1 = value(matchValue);
+      h_1 = matchValue;
     } else {
       matchResult = 1;
     }
@@ -1331,75 +2094,60 @@ function encodeExpressionToolDescriptionElement(et) {
   }
   switch (matchResult) {
     case 0: {
-      withHints = append(basePairs, singleton(["hints", YAMLElement_Sequence(ofSeq(map$1(encodeHintEntry, h_1)))]));
+      withHints = append(basePairs, singleton(["hints", encodeHintsField(et.SourceNodes, h_1)]));
       break;
     }
     default:
       withHints = basePairs;
   }
-  let withRequirements;
-  const matchValue_1 = et.Requirements;
-  let matchResult_1 = void 0, r_1 = void 0;
-  if (matchValue_1 != null) {
-    if (r = value(matchValue_1), r.length > 0) {
-      matchResult_1 = 0;
-      r_1 = value(matchValue_1);
-    } else {
-      matchResult_1 = 1;
-    }
-  } else {
-    matchResult_1 = 1;
-  }
-  switch (matchResult_1) {
-    case 0: {
-      withRequirements = append(withHints, singleton(["requirements", YAMLElement_Sequence(ofSeq(map$1(encodeRequirement, r_1)))]));
-      break;
-    }
-    default:
-      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$1(encodeCWLInput, i_1)))]))) : withRequirements : withRequirements), singleton(["outputs", yMap(toList(map$1(encodeCWLOutput, et.Outputs)))])), singleton(["expression", encodeExpressionScalar(et.Expression)]));
+  const withExpression = append(append(append((matchValue_1 = et.Requirements, matchValue_1 != null ? (r = matchValue_1, r.length > 0) ? (r_1 = matchValue_1, append(withHints, singleton(["requirements", encodeRequirementsField(et.SourceNodes, r_1)]))) : withHints : withHints), singleton(["inputs", (entries = toList(map$1((entry) => ListEntry$1.map(encodeCWLInput, entry), defaultArg(et.Inputs, []))), encodeIdEntries("id", "type", FSharpSet__Contains(et.SourceNodes.WholeFields, "inputs"), entries))])), singleton(["outputs", (entries_1 = toList(map$1((entry_1) => ListEntry$1.map(encodeCWLOutput, entry_1), et.Outputs)), encodeIdEntries("id", "type", FSharpSet__Contains(et.SourceNodes.WholeFields, "outputs"), entries_1))])), singleton(["expression", encodeSchemaSaladStringWith(encodeExpressionScalar, et.Expression)]));
   let withMetadata;
-  const matchValue_3 = et.Metadata;
-  withMetadata = matchValue_3 == null ? withExpression : appendDynamicProperties(value(matchValue_3), withExpression);
-  return yMap(appendDynamicPropertiesExcept(CWLExpressionToolDescription.KnownFieldNames, et, withMetadata));
+  const matchValue_2 = et.Metadata;
+  withMetadata = matchValue_2 == null ? withExpression : appendDynamicProperties(matchValue_2, withExpression);
+  return encodeObject(appendDynamicPropertiesExcept(CWLExpressionToolDescription.KnownFieldNames, et, withMetadata));
 }
 function encodeOperationDescriptionElement(op) {
-  let intent = void 0, h = void 0, matchValue_1 = void 0, r = void 0, r_1 = void 0;
+  let intent = void 0, h = void 0, matchValue_1 = void 0, r = void 0, r_1 = void 0, entries = void 0, entries_1 = void 0;
   let basePairs;
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = ofArray([["cwlVersion", string(op.CWLVersion)], ["class", string("Operation")]]);
+  const acc = ofArray([["cwlVersion", encodeString(op.CWLVersion)], ["class", encodeString("Operation")]]);
   let pairOpt_1;
   const option_1 = op.Id;
-  pairOpt_1 = option_1 != null ? ["id", string(value(option_1))] : void 0;
+  pairOpt_1 = option_1 != null ? ["id", encodeString(option_1)] : void 0;
   const acc_1 = acc;
-  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(value(pairOpt_1)));
-  let pairOpt_3;
-  const option_3 = op.Label;
-  pairOpt_3 = option_3 != null ? encodeLabel(value(option_3)) : void 0;
+  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(pairOpt_1));
+  let encoder;
+  const source = op.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = op.Label;
   const acc_3 = acc_2;
-  acc_4 = pairOpt_3 == null ? acc_3 : append(acc_3, singleton(value(pairOpt_3)));
-  let pairOpt_5;
-  const option_5 = op.Doc;
-  pairOpt_5 = option_5 != null ? encodeDoc(value(option_5)) : void 0;
+  acc_4 = value_1 == null ? acc_3 : append(acc_3, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = op.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeProcessDocValue(source_1, doc);
+  const value_3 = op.Doc;
   const acc_5 = acc_4;
-  acc_6 = pairOpt_5 == null ? acc_5 : append(acc_5, singleton(value(pairOpt_5)));
-  let pairOpt_7;
-  let option_9;
-  const option_7 = op.Intent;
-  option_9 = option_7 != null ? (intent = value(option_7), intent.length > 0) ? option_7 : void 0 : void 0;
-  pairOpt_7 = option_9 != null ? encodeIntent(value(option_9)) : void 0;
+  acc_6 = value_3 == null ? acc_5 : append(acc_5, singleton(["doc", encoder_2(value_3)]));
+  let pairOpt_3;
+  let option_4;
+  const option_3 = op.Intent;
+  option_4 = option_3 != null ? (intent = option_3, intent.length > 0) ? option_3 : void 0 : void 0;
+  let mapping_2;
+  const whole = FSharpSet__Contains(op.SourceNodes.WholeFields, "intent");
+  mapping_2 = (intent_1) => encodeIntent(whole, intent_1);
+  const option_5 = option_4;
+  pairOpt_3 = option_5 != null ? mapping_2(option_5) : void 0;
   const acc_7 = acc_6;
-  basePairs = pairOpt_7 == null ? acc_7 : append(acc_7, singleton(value(pairOpt_7)));
+  basePairs = pairOpt_3 == null ? acc_7 : append(acc_7, singleton(pairOpt_3));
   let withHints;
   const matchValue = op.Hints;
   let matchResult = void 0, h_1 = void 0;
   if (matchValue != null) {
-    if (h = value(matchValue), h.length > 0) {
+    if (h = matchValue, h.length > 0) {
       matchResult = 0;
-      h_1 = value(matchValue);
+      h_1 = matchValue;
     } else {
       matchResult = 1;
     }
@@ -1408,54 +2156,63 @@ function encodeOperationDescriptionElement(op) {
   }
   switch (matchResult) {
     case 0: {
-      withHints = append(basePairs, singleton(["hints", YAMLElement_Sequence(ofSeq(map$1(encodeHintEntry, h_1)))]));
+      withHints = append(basePairs, singleton(["hints", encodeHintsField(op.SourceNodes, h_1)]));
       break;
     }
     default:
       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$1(encodeRequirement, r_1)))]))) : withHints : withHints), singleton(["inputs", yMap(toList(map$1(encodeCWLInput, op.Inputs)))])), singleton(["outputs", yMap(toList(map$1(encodeCWLOutput, op.Outputs)))]));
+  const withOutputs = append(append((matchValue_1 = op.Requirements, matchValue_1 != null ? (r = matchValue_1, r.length > 0) ? (r_1 = matchValue_1, append(withHints, singleton(["requirements", encodeRequirementsField(op.SourceNodes, r_1)]))) : withHints : withHints), singleton(["inputs", (entries = toList(map$1((entry) => ListEntry$1.map(encodeCWLInput, entry), op.Inputs)), encodeIdEntries("id", "type", FSharpSet__Contains(op.SourceNodes.WholeFields, "inputs"), entries))])), singleton(["outputs", (entries_1 = toList(map$1((entry_1) => ListEntry$1.map(encodeCWLOutput, entry_1), op.Outputs)), encodeIdEntries("id", "type", FSharpSet__Contains(op.SourceNodes.WholeFields, "outputs"), entries_1))]));
   let withMetadata;
   const matchValue_2 = op.Metadata;
-  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(value(matchValue_2), withOutputs);
-  return yMap(appendDynamicPropertiesExcept(CWLOperationDescription.KnownFieldNames, op, withMetadata));
+  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(matchValue_2, withOutputs);
+  return encodeObject(appendDynamicPropertiesExcept(CWLOperationDescription.KnownFieldNames, op, withMetadata));
 }
-function encodeWorkflowDescriptionElement(wd) {
-  let intent = void 0, h = void 0, matchValue_1 = void 0, r = void 0, r_1 = void 0;
+function encodeWorkflowWithin(ancestors, wd) {
+  let intent = void 0, h = void 0, matchValue_1 = void 0, r = void 0, r_1 = void 0, entries = void 0, entries_1 = void 0;
+  if (exists((ancestor) => ancestor === wd, ancestors)) {
+    throw ArgumentException_$ctor_Z721C83C5("A step of the workflow holds the workflow itself as its inline run, so the workflow has no text of finite length.");
+  }
   let basePairs;
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = ofArray([["cwlVersion", string(wd.CWLVersion)], ["class", string("Workflow")]]);
+  const acc = ofArray([["cwlVersion", encodeString(wd.CWLVersion)], ["class", encodeString("Workflow")]]);
   let pairOpt_1;
   const option_1 = wd.Id;
-  pairOpt_1 = option_1 != null ? ["id", string(value(option_1))] : void 0;
+  pairOpt_1 = option_1 != null ? ["id", encodeString(option_1)] : void 0;
   const acc_1 = acc;
-  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(value(pairOpt_1)));
-  let pairOpt_3;
-  const option_3 = wd.Label;
-  pairOpt_3 = option_3 != null ? encodeLabel(value(option_3)) : void 0;
+  acc_2 = pairOpt_1 == null ? acc_1 : append(acc_1, singleton(pairOpt_1));
+  let encoder;
+  const source = wd.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = wd.Label;
   const acc_3 = acc_2;
-  acc_4 = pairOpt_3 == null ? acc_3 : append(acc_3, singleton(value(pairOpt_3)));
-  let pairOpt_5;
-  const option_5 = wd.Doc;
-  pairOpt_5 = option_5 != null ? encodeDoc(value(option_5)) : void 0;
+  acc_4 = value_1 == null ? acc_3 : append(acc_3, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = wd.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeProcessDocValue(source_1, doc);
+  const value_3 = wd.Doc;
   const acc_5 = acc_4;
-  acc_6 = pairOpt_5 == null ? acc_5 : append(acc_5, singleton(value(pairOpt_5)));
-  let pairOpt_7;
-  let option_9;
-  const option_7 = wd.Intent;
-  option_9 = option_7 != null ? (intent = value(option_7), intent.length > 0) ? option_7 : void 0 : void 0;
-  pairOpt_7 = option_9 != null ? encodeIntent(value(option_9)) : void 0;
+  acc_6 = value_3 == null ? acc_5 : append(acc_5, singleton(["doc", encoder_2(value_3)]));
+  let pairOpt_3;
+  let option_4;
+  const option_3 = wd.Intent;
+  option_4 = option_3 != null ? (intent = option_3, intent.length > 0) ? option_3 : void 0 : void 0;
+  let mapping_2;
+  const whole = FSharpSet__Contains(wd.SourceNodes.WholeFields, "intent");
+  mapping_2 = (intent_1) => encodeIntent(whole, intent_1);
+  const option_5 = option_4;
+  pairOpt_3 = option_5 != null ? mapping_2(option_5) : void 0;
   const acc_7 = acc_6;
-  basePairs = pairOpt_7 == null ? acc_7 : append(acc_7, singleton(value(pairOpt_7)));
+  basePairs = pairOpt_3 == null ? acc_7 : append(acc_7, singleton(pairOpt_3));
   let withHints;
   const matchValue = wd.Hints;
   let matchResult = void 0, h_1 = void 0;
   if (matchValue != null) {
-    if (h = value(matchValue), h.length > 0) {
+    if (h = matchValue, h.length > 0) {
       matchResult = 0;
-      h_1 = value(matchValue);
+      h_1 = matchValue;
     } else {
       matchResult = 1;
     }
@@ -1464,19 +2221,53 @@ function encodeWorkflowDescriptionElement(wd) {
   }
   switch (matchResult) {
     case 0: {
-      withHints = append(basePairs, singleton(["hints", YAMLElement_Sequence(ofSeq(map$1(encodeHintEntry, h_1)))]));
+      withHints = append(basePairs, singleton(["hints", encodeHintsField(wd.SourceNodes, h_1)]));
       break;
     }
     default:
       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$1(encodeRequirement, r_1)))]))) : withHints : withHints), singleton(["inputs", yMap(toList(map$1(encodeCWLInput, wd.Inputs)))])), singleton(["steps", yMap(toList(map$1(encodeWorkflowStep, wd.Steps)))])), singleton(["outputs", yMap(toList(map$1(encodeCWLOutput, wd.Outputs)))]));
+  const withOutputs = append(append(append((matchValue_1 = wd.Requirements, matchValue_1 != null ? (r = matchValue_1, r.length > 0) ? (r_1 = matchValue_1, append(withHints, singleton(["requirements", encodeRequirementsField(wd.SourceNodes, r_1)]))) : withHints : withHints), singleton(["inputs", (entries = toList(map$1((entry) => ListEntry$1.map(encodeCWLInput, entry), wd.Inputs)), encodeIdEntries("id", "type", FSharpSet__Contains(wd.SourceNodes.WholeFields, "inputs"), entries))])), singleton(["steps", encodeStepsWithin(cons(wd, ancestors), FSharpSet__Contains(wd.SourceNodes.WholeFields, "steps"), wd.Steps)])), singleton(["outputs", (entries_1 = toList(map$1((entry_1) => ListEntry$1.map(encodeCWLOutput, entry_1), wd.Outputs)), encodeIdEntries("id", "type", FSharpSet__Contains(wd.SourceNodes.WholeFields, "outputs"), entries_1))]));
   let withMetadata;
   const matchValue_2 = wd.Metadata;
-  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(value(matchValue_2), withOutputs);
-  return yMap(appendDynamicPropertiesExcept(CWLWorkflowDescription.KnownFieldNames, wd, withMetadata));
+  withMetadata = matchValue_2 == null ? withOutputs : appendDynamicProperties(matchValue_2, withOutputs);
+  return encodeObject(appendDynamicPropertiesExcept(CWLWorkflowDescription.KnownFieldNames, wd, withMetadata));
+}
+function encodeStepsWithin(ancestors, whole, steps) {
+  const encoded = toList(map$1((entry) => ListEntry$1.map((ws) => encodeStepWithin(ancestors, ws), entry), steps));
+  if (exists((entry_1) => {
+    let matchResult = void 0;
+    if (entry_1.tag === /* Value */
+    0) {
+      if (entry_1.fields[0][0] == null) {
+        matchResult = 0;
+      } else {
+        matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+    switch (matchResult) {
+      case 0:
+        return true;
+      default:
+        return false;
+    }
+  }, encoded)) {
+    return encodeSequence(map((entry_2) => encodeListEntry((tupledArg) => {
+      const id = tupledArg[0];
+      const node = tupledArg[1];
+      if (id == null) {
+        return node;
+      } else {
+        return idObject("id", "run", id, node);
+      }
+    }, entry_2), encoded));
+  } else {
+    return encodeIdEntries("id", "run", whole, map((entry_3) => ListEntry$1.map((tupledArg_1) => [value(tupledArg_1[0]), tupledArg_1[1]], entry_3), encoded));
+  }
 }
-function encodeWorkflowStep(ws) {
+function encodeStepWithin(ancestors, ws) {
   let h = void 0, r = void 0;
   let basePairs;
   let acc_10;
@@ -1484,30 +2275,36 @@ function encodeWorkflowStep(ws) {
   let acc_6;
   let acc_4;
   let acc_2;
-  const acc = ofArray([["run", encodeWorkflowStepRun(ws.Run)], ["in", encodeStepInputs(ws.In)], ["out", encodeStepOutputs(ws.Out)]]);
-  const value_2 = ws.Label;
+  const acc = ofArray([["run", encodeRunWithin(ancestors, ws.Run)], ["in", encodeStepInputs(FSharpSet__Contains(ws.SourceNodes.WholeFields, "in"), ws.In)], ["out", encodeStepOutputs(FSharpSet__Contains(ws.SourceNodes.WholeFields, "out"), ws.Out)]]);
+  let encoder;
+  const source = ws.SourceNodes.Label;
+  encoder = (label) => encodeLabelValue(source, label);
+  const value_1 = ws.Label;
   const acc_1 = acc;
-  acc_2 = value_2 == null ? acc_1 : append(acc_1, singleton(["label", string(value(value_2))]));
-  const value_5 = ws.Doc;
+  acc_2 = value_1 == null ? acc_1 : append(acc_1, singleton(["label", encoder(value_1)]));
+  let encoder_2;
+  const source_1 = ws.SourceNodes.Doc;
+  encoder_2 = (doc) => encodeDocValue(source_1, doc);
+  const value_3 = ws.Doc;
   const acc_3 = acc_2;
-  acc_4 = value_5 == null ? acc_3 : append(acc_3, singleton(["doc", string(value(value_5))]));
-  const value_7 = ws.Scatter;
+  acc_4 = value_3 == null ? acc_3 : append(acc_3, singleton(["doc", encoder_2(value_3)]));
+  const value_5 = ws.Scatter;
   const acc_5 = acc_4;
-  acc_6 = value_7 == null ? acc_5 : append(acc_5, singleton(["scatter", encodeScatter(value(value_7))]));
-  const value_9 = ws.ScatterMethod;
+  acc_6 = value_5 == null ? acc_5 : append(acc_5, singleton(["scatter", encodeScatter(value_5)]));
+  const value_7 = ws.ScatterMethod;
   const acc_7 = acc_6;
-  acc_8 = value_9 == null ? acc_7 : append(acc_7, singleton(["scatterMethod", encodeScatterMethod(value(value_9))]));
-  const value_12 = ws.When_;
+  acc_8 = value_7 == null ? acc_7 : append(acc_7, singleton(["scatterMethod", encodeScatterMethod(value_7)]));
+  const value_10 = ws.When_;
   const acc_9 = acc_8;
-  acc_10 = value_12 == null ? acc_9 : append(acc_9, singleton(["when", string(value(value_12))]));
+  acc_10 = value_10 == null ? acc_9 : append(acc_9, singleton(["when", encodeSchemaSaladString(value_10)]));
   basePairs = appendDynamicPropertiesExcept(WorkflowStep.KnownFieldNames, ws, acc_10);
   let withHints;
   const matchValue = ws.Hints;
   let matchResult = void 0, h_1 = void 0;
   if (matchValue != null) {
-    if (h = value(matchValue), h.length > 0) {
+    if (h = matchValue, h.length > 0) {
       matchResult = 0;
-      h_1 = value(matchValue);
+      h_1 = matchValue;
     } else {
       matchResult = 1;
     }
@@ -1516,7 +2313,7 @@ function encodeWorkflowStep(ws) {
   }
   switch (matchResult) {
     case 0: {
-      withHints = append(basePairs, singleton(["hints", YAMLElement_Sequence(ofSeq(map$1(encodeHintEntry, h_1)))]));
+      withHints = append(basePairs, singleton(["hints", encodeHintsField(ws.SourceNodes, h_1)]));
       break;
     }
     default:
@@ -1526,9 +2323,9 @@ function encodeWorkflowStep(ws) {
   const matchValue_1 = ws.Requirements;
   let matchResult_1 = void 0, r_1 = void 0;
   if (matchValue_1 != null) {
-    if (r = value(matchValue_1), r.length > 0) {
+    if (r = matchValue_1, r.length > 0) {
       matchResult_1 = 0;
-      r_1 = value(matchValue_1);
+      r_1 = matchValue_1;
     } else {
       matchResult_1 = 1;
     }
@@ -1537,126 +2334,233 @@ function encodeWorkflowStep(ws) {
   }
   switch (matchResult_1) {
     case 0: {
-      withReq = append(withHints, singleton(["requirements", YAMLElement_Sequence(ofSeq(map$1(encodeRequirement, r_1)))]));
+      withReq = append(withHints, singleton(["requirements", encodeRequirementsField(ws.SourceNodes, r_1)]));
       break;
     }
     default:
       withReq = withHints;
   }
-  return [ws.Id, yMap(withReq)];
+  return [ws.Id, encodeObject(withReq)];
 }
-function writeYaml(element) {
-  return write(element, (c) => new Config(2, c.Level));
+function encodeWorkflowStepRun(run) {
+  return encodeRunWithin(empty(), run);
 }
-function encodeCWLParameterReference(reference) {
-  let option_1 = void 0;
-  const encodedValue = defaultArg((option_1 = reference.Value, option_1 != null ? encodeCWLParameterValue(value(option_1)) : void 0), YAMLElement_Sequence(empty$1()));
-  const dynamicPairs = toList(choose((property) => {
-    const option_4 = encodeDynamicValue(property[1]);
-    if (option_4 != null) {
-      return [property[0], value(option_4)];
-    } else {
-      return void 0;
+function encodeWorkflowDescriptionElement(wd) {
+  return encodeWorkflowWithin(empty(), wd);
+}
+function encodeWorkflowSteps(whole, steps) {
+  return encodeStepsWithin(empty(), whole, steps);
+}
+function encodeWorkflowStep(ws) {
+  return encodeStepWithin(empty(), ws);
+}
+class OpenBlock extends Record {
+  constructor(Source, IsLast, Children, Before, Rebuilt, Next) {
+    super();
+    this.Source = Source;
+    this.IsLast = IsLast;
+    this.Children = Children;
+    this.Before = Before;
+    this.Rebuilt = Rebuilt;
+    this.Next = Next | 0;
+  }
+}
+function OpenBlock_$reflection() {
+  return record_type("ARCtrl.CWL.Encode.OpenBlock", [], OpenBlock, () => [["Source", YamlNode_$reflection()], ["IsLast", bool_type], ["Children", array_type(YamlNode_$reflection())], ["Before", array_type(list_type(Trivia_$reflection()))], ["Rebuilt", array_type(YamlNode_$reflection())], ["Next", int32_type]]);
+}
+function isBlockWithItems(node) {
+  const matchValue = node.Kind;
+  switch (matchValue.tag) {
+    case /* Mapping */
+    1: {
+      const collection = matchValue.fields[0];
+      if (equals(collection.Style, CollectionStyle.Block)) {
+        return !isEmpty(collection.Items);
+      } else {
+        return false;
+      }
     }
-  }, dynamicPropertiesExcept(CWLParameterReference.KnownFieldNames, reference)));
-  let inferredType;
-  const option_6 = reference.Value;
-  inferredType = option_6 != null ? CWLParameterValueModule_tryInferType(value(option_6)) : void 0;
-  let explicitTypePair;
-  const matchValue = reference.Type;
-  let matchResult = void 0, type__1 = void 0;
-  if (matchValue != null) {
-    if (!equals(inferredType, value(matchValue))) {
-      matchResult = 0;
-      type__1 = value(matchValue);
-    } else {
-      matchResult = 1;
+    case /* Sequence */
+    2: {
+      const collection_1 = matchValue.fields[0];
+      if (equals(collection_1.Style, CollectionStyle.Block)) {
+        return !isEmpty(collection_1.Items);
+      } else {
+        return false;
+      }
     }
-  } else {
-    matchResult = 1;
+    default:
+      return false;
   }
-  switch (matchResult) {
-    case 0: {
-      explicitTypePair = ["type", encodeCWLType(type__1)];
-      break;
+}
+function childrenOf(node) {
+  const matchValue = node.Kind;
+  switch (matchValue.tag) {
+    case /* Mapping */
+    1: {
+      const collection = matchValue.fields[0];
+      return [toArray$1(delay(() => map$1((entry) => entry.Value, collection.Items))), toArray$1(delay(() => map$1((entry_1) => entry_1.Before, collection.Items)))];
+    }
+    case /* Sequence */
+    2: {
+      const collection_1 = matchValue.fields[0];
+      return [toArray$1(delay(() => map$1((item) => item.Node, collection_1.Items))), toArray$1(delay(() => map$1((item_1) => item_1.Before, collection_1.Items)))];
     }
     default:
-      explicitTypePair = void 0;
+      return [[], []];
   }
-  let encodedReference;
-  let matchResult_1 = void 0, overflow_1 = void 0, typePair = void 0, value_5 = void 0;
-  if (explicitTypePair == null) {
-    if (isEmpty(dynamicPairs)) {
-      matchResult_1 = 0;
-    } else if (encodedValue.tag === /* Object */
-    3) {
-      matchResult_1 = 1;
-    } else {
-      matchResult_1 = 2;
-      overflow_1 = dynamicPairs;
-      typePair = explicitTypePair;
-      value_5 = encodedValue;
-    }
-  } else {
-    matchResult_1 = 2;
-    overflow_1 = dynamicPairs;
-    typePair = explicitTypePair;
-    value_5 = encodedValue;
+}
+function endOf(node) {
+  const matchValue = node.Kind;
+  switch (matchValue.tag) {
+    case /* Mapping */
+    1:
+      return matchValue.fields[0].End;
+    case /* Sequence */
+    2:
+      return matchValue.fields[0].End;
+    default:
+      return empty();
   }
-  switch (matchResult_1) {
-    case 0: {
-      encodedReference = encodedValue;
-      break;
+}
+function rebuildBlock(node, before, children, collectionEnd) {
+  const matchValue = node.Kind;
+  switch (matchValue.tag) {
+    case /* Mapping */
+    1: {
+      const collection = matchValue.fields[0];
+      return new YamlNode(YamlNodeKind_Mapping(new Collection$1(collection.Style, collection.OpeningComment, mapIndexed((index, entry) => new MappingEntry(item(index, before), entry.Question, entry.Key, entry.BeforeColon, entry.Colon, item(index, children), entry.Span), collection.Items), collectionEnd)), node.Properties, node.PropertyLayout, node.TrailingComment, node.Span);
     }
-    case 1: {
-      const valuePairs = choose$1((_arg) => {
-        if (_arg.tag === /* Mapping */
-        0) {
-          return [_arg.fields[0].Value, _arg.fields[1]];
+    case /* Sequence */
+    2: {
+      const collection_1 = matchValue.fields[0];
+      return new YamlNode(YamlNodeKind_Sequence(new Collection$1(collection_1.Style, collection_1.OpeningComment, mapIndexed((index_1, item$1) => {
+        let dash;
+        const matchValue_1 = item$1.Dash;
+        let matchResult = void 0, other = void 0;
+        if (matchValue_1 != null) {
+          if (matchValue_1.tag === /* Inline */
+          0) {
+            if (startsWithTrivia(item(index_1, children))) {
+              matchResult = 0;
+            } else {
+              matchResult = 1;
+              other = matchValue_1;
+            }
+          } else {
+            matchResult = 1;
+            other = matchValue_1;
+          }
         } else {
-          return void 0;
+          matchResult = 1;
+          other = matchValue_1;
         }
-      }, encodedValue.fields[0]);
-      const valueKeys = ofSeq$1(map$1((tuple) => tuple[0], valuePairs), {
-        Compare: (x, y) => comparePrimitives(x, y) | 0
-      });
-      encodedReference = yMap(append(valuePairs, filter((tupledArg) => !contains(tupledArg[0], valueKeys), dynamicPairs)));
-      break;
+        switch (matchResult) {
+          case 0: {
+            dash = lineBreakDash;
+            break;
+          }
+          default:
+            dash = other;
+        }
+        return new SequenceItem(item(index_1, before), dash, item(index_1, children), item$1.Span);
+      }, collection_1.Items), collectionEnd)), node.Properties, node.PropertyLayout, node.TrailingComment, node.Span);
     }
     default:
-      encodedReference = yMap(toList(delay(() => append$1(ofArray(toArray(typePair)), delay(() => append$1(singleton$1(["value", value_5]), delay(() => overflow_1)))))));
+      return node;
   }
-  return [reference.Key, encodedReference];
 }
-function encodeYAMLParameterFile(references) {
-  return writeYaml(yMap(toList(map$1(encodeCWLParameterReference, references))));
+function hasMisplacedEnd(rootIsLast, root) {
+  const pending = [];
+  void pending.push([root, rootIsLast]);
+  let found = false;
+  while (!found && pending.length > 0) {
+    const patternInput = item(pending.length - 1, pending);
+    const node = patternInput[0];
+    const isLast = patternInput[1];
+    pending.splice(pending.length - 1, 1);
+    if (isBlockWithItems(node)) {
+      if (!isLast && !isEmpty(endOf(node))) {
+        found = true;
+      } else {
+        const children = childrenOf(node)[0];
+        iterateIndexed((index, child) => {
+          void pending.push([child, isLast && index === children.length - 1]);
+        }, children);
+      }
+    }
+  }
+  return found;
 }
-function getObjectPairs(element) {
-  if (element.tag === /* Object */
-  3) {
-    return choose$1((_arg) => {
-      if (_arg.tag === /* Mapping */
+function moveEndTrivia(rootIsLast, root) {
+  if (!hasMisplacedEnd(rootIsLast, root)) {
+    return root;
+  } else {
+    const unfinished = [];
+    let result = root;
+    const enter = (node, isLast) => {
+      const patternInput = childrenOf(node);
+      const children = patternInput[0];
+      void unfinished.push(new OpenBlock(node, isLast, children, copy(patternInput[1]), copy(children), 0));
+    };
+    const isBlankLine = (line) => {
+      if (line.tag === /* FullLineComment */
       0) {
-        return [_arg.fields[0].Value, _arg.fields[1]];
+        return false;
       } else {
-        return void 0;
+        return true;
       }
-    }, element.fields[0]);
-  } else {
-    return empty$1();
+    };
+    enter(root, rootIsLast);
+    while (unfinished.length > 0) {
+      let trivia = void 0, moved = void 0, last = void 0;
+      const top = item(unfinished.length - 1, unfinished);
+      if (top.Next < top.Children.length) {
+        const index = top.Next | 0;
+        top.Next = index + 1 | 0;
+        const child = item(index, top.Children);
+        if (isBlockWithItems(child)) {
+          enter(child, top.IsLast && index === top.Children.length - 1);
+        }
+      } else {
+        unfinished.splice(unfinished.length - 1, 1);
+        const rebuilt = rebuildBlock(top.Source, top.Before, top.Rebuilt, (trivia = endOf(top.Source), (top.IsLast ? true : isEmpty(trivia)) ? trivia : (moved = reverse(skipWhile(isBlankLine, reverse(skipWhile(isBlankLine, trivia)))), last = top.Before.length - 1 | 0, top.Before[last] = append(item(last, top.Before), moved), empty())));
+        if (unfinished.length === 0) {
+          result = rebuilt;
+        } else {
+          const parent = item(unfinished.length - 1, unfinished);
+          parent.Rebuilt[parent.Next - 1] = rebuilt;
+        }
+      }
+    }
+    return result;
   }
 }
+const writerOptions = WriterOptionsModule_defaults;
+function writeYaml(element) {
+  return Writer_writeNode(writerOptions, moveEndTrivia(true, element));
+}
+function encodeCWLParameterReference(reference) {
+  let option_1 = void 0;
+  const encodedValue = defaultArg((option_1 = reference.Value, option_1 != null ? encodeCWLParameterValue(option_1) : void 0), encodeSequence(empty()));
+  return [reference.Key, encodedValue];
+}
+function encodeYAMLParameterFile(references) {
+  return writeYaml(encodeObject(toList(map$1(encodeCWLParameterReference, references))));
+}
 function renderTopLevelElement(baseKeys, orderedSectionKeys, element) {
-  const section = (pairs) => trimEnd(replace(writeYaml(yMap(pairs)), "\r\n", "\n"), "\n");
-  const pairs_2 = getObjectPairs(element);
-  const basePairs = filter((tupledArg) => contains$1(tupledArg[0], baseKeys, {
+  let entries;
+  const matchValue = element.Kind;
+  entries = matchValue.tag === /* Mapping */
+  1 ? map((entry) => [Decode_entryName(entry), entry], matchValue.fields[0].Items) : empty();
+  const basePairs = filter((tupledArg) => contains(tupledArg[0], baseKeys, {
     Equals: (x, y) => x === y,
     GetHashCode: (x) => stringHash(x) | 0
-  }), pairs_2);
+  }), entries);
   const knownSections = choose$1((sectionKey) => {
-    const option_1 = tryFind((tupledArg_1) => tupledArg_1[0] === sectionKey, pairs_2);
+    const option_1 = tryFind((tupledArg_1) => tupledArg_1[0] === sectionKey, entries);
     if (option_1 != null) {
-      return singleton(value(option_1));
+      return singleton(option_1);
     } else {
       return void 0;
     }
@@ -1664,48 +2568,41 @@ function renderTopLevelElement(baseKeys, orderedSectionKeys, element) {
   const reservedKeys = ofList(append(baseKeys, orderedSectionKeys), {
     Compare: (x_1, y_1) => comparePrimitives(x_1, y_1) | 0
   });
-  const metadataPairs = filter((tupledArg_2) => !FSharpSet__Contains(reservedKeys, tupledArg_2[0]), pairs_2);
-  const merge = (acc_mut, remaining_mut) => {
-    merge:
-      while (true) {
-        const acc = acc_mut, remaining = remaining_mut;
-        let matchResult = void 0, a_1 = void 0, b_1 = void 0, rest_1 = void 0, l = void 0, rest_2 = void 0;
-        if (isEmpty(remaining)) {
-          matchResult = 2;
-        } else if (!isEmpty(tail(remaining))) {
-          if (head(remaining).trim() === "-" && trimStart(head(tail(remaining))).indexOf(":") >= 0) {
-            matchResult = 0;
-            a_1 = head(remaining);
-            b_1 = head(tail(remaining));
-            rest_1 = tail(tail(remaining));
-          } else {
-            matchResult = 1;
-            l = head(remaining);
-            rest_2 = tail(remaining);
-          }
-        } else {
-          matchResult = 1;
-          l = head(remaining);
-          rest_2 = tail(remaining);
-        }
-        switch (matchResult) {
-          case 0: {
-            acc_mut = cons(a_1 + " " + b_1.trim(), acc);
-            remaining_mut = rest_1;
-            continue merge;
-          }
-          case 1: {
-            acc_mut = cons(l, acc);
-            remaining_mut = rest_2;
-            continue merge;
-          }
-          default:
-            return reverse(acc);
-        }
-        break;
+  const metadataPairs = filter((tupledArg_2) => !FSharpSet__Contains(reservedKeys, tupledArg_2[0]), entries);
+  const sections = toArray$2(map((list_5) => map((tuple) => tuple[1], list_5), toList(delay(() => append$1(length(basePairs) > 0 ? singleton$1(basePairs) : empty$2(), delay(() => append$1(knownSections, delay(() => length(metadataPairs) > 0 ? singleton$1(metadataPairs) : empty$2()))))))));
+  const sections_1 = mapIndexed$1((index, section) => {
+    if (index < sections.length - 1) {
+      const last$1 = last(section);
+      return append(take(length(section) - 1, section), singleton(new MappingEntry(last$1.Before, last$1.Question, last$1.Key, last$1.BeforeColon, last$1.Colon, moveEndTrivia(false, last$1.Value), last$1.Span)));
+    } else {
+      return section;
+    }
+  }, sections);
+  const separated = concat(mapIndexed$1((index_1, section_1) => {
+    let matchResult = void 0, first_1 = void 0, rest_1 = void 0;
+    if (!isEmpty(section_1)) {
+      if (index_1 > 0 && !Writer_endsWithKeptLines(writerOptions, last(item(index_1 - 1, sections_1)).Value)) {
+        matchResult = 0;
+        first_1 = head(section_1);
+        rest_1 = tail(section_1);
+      } else {
+        matchResult = 1;
       }
-  };
-  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(section, knownSections), delay(() => length(metadataPairs) > 0 ? singleton$1(section(metadataPairs)) : empty$2()))))))), ["\r\n"], void 0, 0))));
+    } else {
+      matchResult = 1;
+    }
+    switch (matchResult) {
+      case 0:
+        return cons(new MappingEntry(cons(Trivia_BlankLine(void 0), first_1.Before), first_1.Question, first_1.Key, first_1.BeforeColon, first_1.Colon, first_1.Value, first_1.Span), rest_1);
+      default:
+        return section_1;
+    }
+  }, sections_1));
+  if (isEmpty(separated)) {
+    return "";
+  } else {
+    return writeYaml(YamlNodeModule_mapping(separated));
+  }
 }
 function encodeToolDescription(td) {
   return renderTopLevelElement(ofArray(["cwlVersion", "class", "id", "label", "doc", "intent"]), ofArray(["hints", "requirements", "baseCommand", "inputs", "outputs"]), encodeToolDescriptionElement(td));
@@ -1719,6 +2616,24 @@ function encodeExpressionToolDescription(et) {
 function encodeOperationDescription(op) {
   return renderTopLevelElement(ofArray(["cwlVersion", "class", "id", "label", "doc", "intent"]), ofArray(["hints", "requirements", "inputs", "outputs"]), encodeOperationDescriptionElement(op));
 }
+function encodeProcessingUnitElement(pu) {
+  switch (pu.tag) {
+    case /* Workflow */
+    1:
+      return encodeWorkflowDescriptionElement(pu.fields[0]);
+    case /* ExpressionTool */
+    2:
+      return encodeExpressionToolDescriptionElement(pu.fields[0]);
+    case /* Operation */
+    3:
+      return encodeOperationDescriptionElement(pu.fields[0]);
+    case /* RawProcess */
+    4:
+      return rawYamlNode(pu.fields[0]);
+    default:
+      return encodeToolDescriptionElement(pu.fields[0]);
+  }
+}
 function encodeProcessingUnit(pu) {
   switch (pu.tag) {
     case /* Workflow */
@@ -1730,71 +2645,44 @@ function encodeProcessingUnit(pu) {
     case /* Operation */
     3:
       return encodeOperationDescription(pu.fields[0]);
+    case /* RawProcess */
+    4:
+      return writeYaml(pu.fields[0].Node);
     default:
       return encodeToolDescription(pu.fields[0]);
   }
 }
-function encodeCWLTypeYaml(t) {
+function encodeCWLTypeFlow(t) {
+  const flowObject = (pairs) => YamlNodeModule_flowMapping(toList(delay(() => collect((matchValue) => singleton$1(YamlNodeModule_entry(textNode(matchValue[0]), matchValue[1])), pairs))));
+  const flowList = (nodes) => YamlNodeModule_flowSequence(map(YamlNodeModule_item, nodes));
   switch (t.tag) {
     case /* Union */
-    14:
-      return "[" + join(", ", map$1(encodeCWLTypeYaml, t.fields[0])) + "]";
+    21:
+      return flowList(toList(map$1(encodeCWLTypeFlow, t.fields[0])));
     case /* Array */
-    11:
-      return encodeInputArraySchemaYaml(t.fields[0]);
-    case /* Record */
-    12:
-      return encodeInputRecordSchemaYaml(t.fields[0]);
-    case /* Enum */
-    13:
-      return encodeInputEnumSchemaYaml(t.fields[0]);
-    case /* Null */
-    10:
-      return '"null"';
-    default: {
-      const yamlForm = writeYaml(encodeCWLType(t));
-      return yamlForm.trim();
+    18: {
+      const arraySchema = t.fields[0];
+      return flowObject(ofArray([["type", Encode_string("array")], ["items", encodeCWLTypeFlow(arraySchema.Items)]]));
     }
-  }
-}
-function encodeInputRecordFieldYaml(field) {
-  const typeYaml = encodeCWLTypeYaml(field.Type);
-  return `{name: ${field.Name}, type: ${typeYaml}}`;
-}
-function encodeInputRecordSchemaYaml(schema) {
-  let fs = void 0;
-  let fieldsYaml;
-  const matchValue = schema.Fields;
-  let matchResult = void 0, fs_1 = void 0;
-  if (matchValue != null) {
-    if (fs = value(matchValue), fs.length > 0) {
-      matchResult = 0;
-      fs_1 = value(matchValue);
-    } else {
-      matchResult = 1;
+    case /* Record */
+    19: {
+      const recordSchema = t.fields[0];
+      let fields;
+      const matchValue_1 = recordSchema.Fields;
+      fields = matchValue_1 == null ? empty() : toList(map$1((entry) => encodeListEntry((field) => flowObject(ofArray([["name", textNode(field.Name)], ["type", encodeCWLTypeFlow(field.Type)]])), entry), matchValue_1));
+      return flowObject(ofArray([["type", Encode_string("record")], ["fields", flowList(fields)]]));
     }
-  } else {
-    matchResult = 1;
-  }
-  switch (matchResult) {
-    case 0: {
-      fieldsYaml = join(", ", map$1(encodeInputRecordFieldYaml, fs_1));
-      break;
+    case /* Enum */
+    20: {
+      const enumSchema = t.fields[0];
+      return flowObject(ofArray([["type", Encode_string("enum")], ["symbols", flowList(toList(map$1((value_1) => encodeSchemaSaladStringWith(textNode, value_1), enumSchema.Symbols)))]]));
     }
     default:
-      fieldsYaml = "";
-  }
-  if (fieldsYaml === "") {
-    return "{type: record, fields: []}";
-  } else {
-    return concat("{type: record, fields: [", fieldsYaml, "]}");
+      return encodeCWLType(t);
   }
 }
-function encodeInputEnumSchemaYaml(schema) {
-  return concat("{type: enum, symbols: [", join(", ", schema.Symbols), "]}");
-}
-function encodeInputArraySchemaYaml(schema) {
-  return concat("{type: array, items: ", encodeCWLTypeYaml(schema.Items), "}");
+function encodeCWLTypeYaml(t) {
+  return writeYaml(encodeCWLTypeFlow(t)).trim();
 }
 function cwlTypeToYamlString(t) {
   return encodeCWLTypeYaml(t);
@@ -1804,4 +2692,4 @@ function formatCWLType(type_) {
   return s.trim();
 }
 
-export { $007CPrimitiveType$007CComplexType$007C, appendDynamicProperties, appendDynamicPropertiesExcept, cwlTypeToYamlString, encodeCWLInput, encodeCWLOutput, encodeCWLParameterReference, encodeCWLParameterValue, 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, encodeYAMLParameterFile, formatCWLType, getObjectPairs, isComplexType, normalizeDocString, normalizeEnvValueForEncode, renderTopLevelElement, tryGetArrayShorthand, writeYaml, yBool, yFloat, yMap };
+export { $007COptionalOf$007C_$007C, $007CPrimitiveType$007CComplexType$007C, appendDynamicProperties, appendDynamicPropertiesExcept, cwlTypeToYamlString, directive, encodeBindingPosition, encodeCWLInput, encodeCWLOutput, encodeCWLParameterReference, encodeCWLParameterValue, encodeCWLType, encodeCWLTypeFlow, encodeCWLTypeShorthand, encodeCWLTypeYaml, encodeDirectoryPairs, encodeDoc, encodeDocText, encodeDocValue, encodeDynamicObj, encodeDynamicValue, encodeExpressionScalar, encodeExpressionToolDescription, encodeExpressionToolDescriptionElement, encodeFilePairs, encodeFileSize, encodeHintEntry, encodeIdEntries, encodeIdMapOrList, encodeInputArraySchema, encodeInputBinding, encodeInputEnumSchema, encodeInputFormat, encodeInputRecordField, encodeInputRecordSchema, encodeIntList, encodeIntent, encodeLabel, encodeLabelValue, encodeLinkMergeMethod, encodeListEntry, encodeLoadListing, encodeObject, encodeOperationDescription, encodeOperationDescriptionElement, encodeOutputBinding, encodeOutputGlob, encodePickValueMethod, encodeProcessDocValue, encodeProcessingUnit, encodeProcessingUnitElement, encodeRequirement, encodeScatter, encodeScatterMethod, encodeSchemaDefinition, encodeSchemaSaladBool, encodeSchemaSaladString, encodeSchemaSaladStringWith, encodeSchemaType, encodeSequence, encodeSourceArray, encodeSourceText, encodeStepInput, encodeStepInputs, encodeStepOutputParameter, encodeStepOutputs, encodeString, encodeStringList, encodeToolDescription, encodeToolDescriptionElement, encodeTypeWith, encodeWorkflowDescription, encodeWorkflowDescriptionElement, encodeWorkflowStep, encodeWorkflowStepRun, encodeWorkflowSteps, encodeYAMLParameterFile, formatCWLType, inputArraySchemaPairs, inputEnumSchemaPairs, inputRecordSchemaPairs, isComplexType, normalizeDocString, rawYamlNode, renderTopLevelElement, tryGetArrayShorthand, writeYaml };