@nfdi4plants/arctrl 3.2.2 → 3.3.0

package/dist/ts/ts/WorkflowGraph/Builder.js

@@ -1,37 +1,43 @@
 import { Record } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
-import { WorkflowGraph_$reflection, WorkflowGraph_create_4D231A1, GraphBuildIssue_create_Z2F3B511A, WorkflowGraphEdge_create_5E4B5E48, GraphId_edgeId, GraphId_unitNodeId, WorkflowGraphNode_create_62C775C0, NodeKind_ProcessingUnitNode, GraphId_portNodeId, NodeKind_PortNode, GraphId_stepNodeId, NodeKind, EdgeKind, PortDirection, GraphIssueKind, ProcessingUnitKind, GraphId_childScope, GraphId_normalizeSegment } from './GraphTypes.js';
+import { WorkflowGraph_$reflection, WorkflowGraph_create_4D231A1, GraphBuildIssue_create_Z2F3B511A, WorkflowGraphEdge_create_5E4B5E48, GraphId_edgeId, GraphId_unitNodeId, WorkflowGraphNode_create_62C775C0, NodeKind_ProcessingUnitNode, GraphId_portNodeId, NodeKind_PortNode, GraphId_anonymousStepNodeId, GraphId_stepNodeId, NodeKind, EdgeKind, PortDirection, GraphIssueKind, ProcessingUnitKind, GraphId_childScope, GraphId_normalizeSegment } from './GraphTypes.js';
 import { empty, FSharpSet__Contains, FSharpSet__Add } from '../../node_modules/@fable-org/fable-library-ts/Set.js';
-import { empty as empty$1, FSharpMap__ContainsKey, FSharpMap__get_Item, FSharpMap__Add, tryFind } from '../../node_modules/@fable-org/fable-library-ts/Map.js';
-import { WorkflowStepRun_$reflection, WorkflowStepRun_RunString } from '../CWL/WorkflowSteps.js';
+import { empty as empty$1, ofArray, tryPick, singleton, exists, cons, iterate as iterate$1 } from '../../node_modules/@fable-org/fable-library-ts/List.js';
+import { CWLProcessingUnit_$reflection, WorkflowStepRunOps_fromOperation, WorkflowStepRunOps_fromExpressionTool, WorkflowStepRunOps_fromWorkflow, WorkflowStepRunOps_fromTool, CWLProcessingUnit, WorkflowStepRunOps_tryGetOperation, CWLProcessingUnit_Operation, WorkflowStepRunOps_tryGetExpressionTool, CWLProcessingUnit_ExpressionTool, WorkflowStepRunOps_tryGetWorkflow, CWLProcessingUnit_Workflow, WorkflowStepRunOps_tryGetTool, CWLProcessingUnit_CommandLineTool } from '../CWL/CWLProcessingUnit.js';
+import { empty as empty$2, FSharpMap__ContainsKey, FSharpMap__get_Item, FSharpMap__Add, tryFind } from '../../node_modules/@fable-org/fable-library-ts/Map.js';
+import { WorkflowStepRun_$reflection, WorkflowStep, StepOutput, WorkflowStepRun_RunString } from '../CWL/WorkflowSteps.js';
 import { WorkflowGraphBuildOptions_$reflection, WorkflowGraphBuildOptionsModule_defaultOptions } from './BuildOptions.js';
-import { record_type, class_type, string_type, option_type, bool_type, array_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
+import { record_type, class_type, list_type, string_type, option_type, bool_type, array_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { unwrap, value, some, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { comparePrimitives, getEnumerator, disposeSafe, stringHash } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { DynamicObj } from '../fable_modules/DynamicObj.8.0.0/DynamicObj.fs.js';
 import { setProperty } from '../fable_modules/DynamicObj.8.0.0/DynObj.fs.js';
-import { ofArray, tryPick, singleton } from '../../node_modules/@fable-org/fable-library-ts/List.js';
-import { toArray, iterate, tryHead, toList, delay, singleton as singleton$1 } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
-import { ReferenceParsing_extractStepOutputId, ReferenceParsing_parseSourceReference } from './ReferenceParsing.js';
-import { isNullOrWhiteSpace, substring, endsWith, concat } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { ReferenceParsing_relativeId, ReferenceParsing_parseSourceReference } from './ReferenceParsing.js';
+import { concat, isNullOrWhiteSpace, substring, endsWith } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { SchemaSaladStringModule_tryLiteral, RawYaml__TryScalarField_Z721C83C5, ListEntry$1 } from '../CWL/CWLTypes.js';
+import { toArray, map, iterate, choose, tryHead, toList, delay, singleton as singleton$1, indexed } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { CWLWorkflowDescription } from '../CWL/WorkflowDescription.js';
+import { CWLToolDescription } from '../CWL/ToolDescription.js';
+import { CWLExpressionToolDescription } from '../CWL/ExpressionToolDescription.js';
+import { CWLOperationDescription } from '../CWL/OperationDescription.js';
 import { getFileName, normalize, resolvePathFromFile, normalizePathKey } from '../FileSystem/Path.js';
 import { Array_distinct } from '../../node_modules/@fable-org/fable-library-ts/Seq2.js';
-import { WorkflowStepRunOps_fromTool, WorkflowStepRunOps_fromOperation, WorkflowStepRunOps_fromExpressionTool, WorkflowStepRunOps_fromWorkflow, WorkflowStepRunOps_tryGetOperation, CWLProcessingUnit_Operation, WorkflowStepRunOps_tryGetExpressionTool, CWLProcessingUnit_ExpressionTool, WorkflowStepRunOps_tryGetWorkflow, CWLProcessingUnit_Workflow, WorkflowStepRunOps_tryGetTool, CWLProcessingUnit_CommandLineTool } from '../CWL/CWLProcessingUnit.js';
-import { map, item, tryPick as tryPick$1 } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { map as map$1, item, tryPick as tryPick$1 } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 
 class BuildState extends Record {
-  constructor(Graph, NodeIds, EdgeIds, RunResolutionStack, RunResolutionCache, RunNodeCache, Options) {
+  constructor(Graph, NodeIds, EdgeIds, RunResolutionStack, ActiveWorkflows, RunResolutionCache, RunNodeCache, Options) {
     super();
     this.Graph = Graph;
     this.NodeIds = NodeIds;
     this.EdgeIds = EdgeIds;
     this.RunResolutionStack = RunResolutionStack;
+    this.ActiveWorkflows = ActiveWorkflows;
     this.RunResolutionCache = RunResolutionCache;
     this.RunNodeCache = RunNodeCache;
     this.Options = Options;
   }
 }
 function BuildState_$reflection() {
-  return record_type("ARCtrl.WorkflowGraph.Builder.BuildState", [], BuildState, () => [["Graph", WorkflowGraph_$reflection()], ["NodeIds", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["EdgeIds", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["RunResolutionStack", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["RunResolutionCache", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, WorkflowStepRun_$reflection()])], ["RunNodeCache", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, string_type])], ["Options", WorkflowGraphBuildOptions_$reflection()]]);
+  return record_type("ARCtrl.WorkflowGraph.Builder.BuildState", [], BuildState, () => [["Graph", WorkflowGraph_$reflection()], ["NodeIds", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["EdgeIds", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["RunResolutionStack", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [string_type])], ["ActiveWorkflows", list_type(CWLProcessingUnit_$reflection())], ["RunResolutionCache", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, WorkflowStepRun_$reflection()])], ["RunNodeCache", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, string_type])], ["Options", WorkflowGraphBuildOptions_$reflection()]]);
 }
 class RunResolutionResult extends Record {
   constructor(ResolvedRun, ResolvedFromPath, AttemptedLookup, ResolutionPathKeys) {
@@ -55,9 +61,9 @@ function createState(options, rootNodeId) {
     Compare: (x_1, y_1) => comparePrimitives(x_1, y_1) | 0
   }), empty({
     Compare: (x_2, y_2) => comparePrimitives(x_2, y_2) | 0
-  }), empty$1({
+  }), empty$1(), empty$2({
     Compare: (x_3, y_3) => comparePrimitives(x_3, y_3) | 0
-  }), empty$1({
+  }), empty$2({
     Compare: (x_4, y_4) => comparePrimitives(x_4, y_4) | 0
   }), options);
 }
@@ -116,54 +122,80 @@ function addPortNode(state, ownerNodeId, direction, portId, label) {
   addNode(state, WorkflowGraphNode_create_62C775C0(nodeId, NodeKind_PortNode(direction), label, ownerNodeId));
   return nodeId;
 }
-function addStepNode(state, scope, workflowNodeId, step) {
-  let option_1 = void 0, option_3 = void 0, sm = void 0, option_5 = void 0;
-  const stepNodeId = GraphId_stepNodeId(scope, step.Id);
-  const metadata = createMetadata(ofArray([["when", (option_1 = step.When_, option_1 != null ? some(value(option_1)) : void 0)], ["scatterMethod", (option_3 = step.ScatterMethod, option_3 != null ? some((sm = value(option_3), sm.AsCwlString)) : void 0)], ["scatter", (option_5 = step.Scatter, option_5 != null ? some(toArray(value(option_5))) : void 0)]]));
-  addNode(state, WorkflowGraphNode_create_62C775C0(stepNodeId, NodeKind.StepNode, defaultArg(step.Label, step.Id), workflowNodeId, void 0, unwrap(metadata)));
+class StepIdentity extends Record {
+  constructor(NodeId, Name, RunSegment) {
+    super();
+    this.NodeId = NodeId;
+    this.Name = Name;
+    this.RunSegment = RunSegment;
+  }
+}
+function StepIdentity_$reflection() {
+  return record_type("ARCtrl.WorkflowGraph.Builder.StepIdentity", [], StepIdentity, () => [["NodeId", string_type], ["Name", string_type], ["RunSegment", string_type]]);
+}
+function stepIdentity(scope, workflowId, position, step) {
+  const matchValue = step.Id;
+  if (matchValue == null) {
+    return new StepIdentity(GraphId_anonymousStepNodeId(scope, position), `steps[${position}]`, `anonymous:${position}/run`);
+  } else {
+    const name = ReferenceParsing_relativeId(workflowId, matchValue);
+    return new StepIdentity(GraphId_stepNodeId(scope, name), name, concat(name, "/run"));
+  }
+}
+function addStepNode(state, workflowNodeId, identity, step) {
+  let option_1 = void 0, expression = void 0, option_3 = void 0, sm = void 0, option_5 = void 0, option_7 = void 0;
+  const stepNodeId = identity.NodeId;
+  const metadata = createMetadata(ofArray([["when", (option_1 = step.When_, option_1 != null ? some((expression = option_1, expression.AsDirectiveString)) : void 0)], ["scatterMethod", (option_3 = step.ScatterMethod, option_3 != null ? some((sm = option_3, sm.AsCwlString)) : void 0)], ["scatter", (option_5 = step.Scatter, option_5 != null ? some(toArray(map((value_1) => value_1.AsDirectiveString, option_5))) : void 0)]]));
+  addNode(state, WorkflowGraphNode_create_62C775C0(stepNodeId, NodeKind.StepNode, defaultArg((option_7 = step.Label, option_7 != null ? SchemaSaladStringModule_tryLiteral(option_7) : void 0), identity.Name), workflowNodeId, void 0, unwrap(metadata)));
   addEdgeByType(state, EdgeKind.Contains, workflowNodeId, stepNodeId, void 0);
   return stepNodeId;
 }
 function addWorkflowPorts(state, workflowNodeId, workflow) {
+  let relative;
+  const holderId = workflow.Id;
+  relative = (id) => ReferenceParsing_relativeId(holderId, id);
   iterate((input) => {
-    addPortNode(state, workflowNodeId, PortDirection.Input, input.Name, input.Name);
-  }, workflow.Inputs);
+    addPortNode(state, workflowNodeId, PortDirection.Input, relative(input.Name), relative(input.Name));
+  }, CWLWorkflowDescription.getInputValues(workflow));
   iterate((output) => {
-    addPortNode(state, workflowNodeId, PortDirection.Output, output.Name, output.Name);
-  }, workflow.Outputs);
+    addPortNode(state, workflowNodeId, PortDirection.Output, relative(output.Name), relative(output.Name));
+  }, CWLWorkflowDescription.getOutputValues(workflow));
 }
 function addToolPorts(state, toolNodeId, tool) {
   iterate((input) => {
     addPortNode(state, toolNodeId, PortDirection.Input, input.Name, input.Name);
-  }, defaultArg(tool.Inputs, []));
+  }, CWLToolDescription.getInputValuesOrEmpty(tool));
   iterate((output) => {
     addPortNode(state, toolNodeId, PortDirection.Output, output.Name, output.Name);
-  }, tool.Outputs);
+  }, CWLToolDescription.getOutputValues(tool));
 }
 function addExpressionToolPorts(state, toolNodeId, tool) {
   iterate((input) => {
     addPortNode(state, toolNodeId, PortDirection.Input, input.Name, input.Name);
-  }, defaultArg(tool.Inputs, []));
+  }, CWLExpressionToolDescription.getInputValuesOrEmpty(tool));
   iterate((output) => {
     addPortNode(state, toolNodeId, PortDirection.Output, output.Name, output.Name);
-  }, tool.Outputs);
+  }, CWLExpressionToolDescription.getOutputValues(tool));
 }
 function addOperationPorts(state, operationNodeId, operation) {
   iterate((input) => {
     addPortNode(state, operationNodeId, PortDirection.Input, input.Name, input.Name);
-  }, operation.Inputs);
+  }, CWLOperationDescription.getInputValues(operation));
   iterate((output) => {
     addPortNode(state, operationNodeId, PortDirection.Output, output.Name, output.Name);
-  }, operation.Outputs);
+  }, CWLOperationDescription.getOutputValues(operation));
 }
 function addStepPorts(state, stepNodeId, step) {
+  let relative;
+  const holderId = step.Id;
+  relative = (id) => ReferenceParsing_relativeId(holderId, id);
   iterate((input) => {
-    addPortNode(state, stepNodeId, PortDirection.Input, input.Id, input.Id);
-  }, step.In);
-  iterate((output) => {
-    const outputId = ReferenceParsing_extractStepOutputId(output);
+    addPortNode(state, stepNodeId, PortDirection.Input, relative(input.Id), relative(input.Id));
+  }, WorkflowStep.getInputValues(step));
+  iterate((id_1) => {
+    const outputId = relative(id_1);
     addPortNode(state, stepNodeId, PortDirection.Output, outputId, outputId);
-  }, step.Out);
+  }, choose((output) => StepOutput.tryId(output), step.Out));
 }
 function trimToNameCandidate(value) {
   if (isNullOrWhiteSpace(value)) {
@@ -218,7 +250,7 @@ function tryGetProcessingUnitName(processingUnit) {
       option_1 = void 0;
     }
     if (option_1 != null) {
-      return tryBasenameNoCwlExtension(value(option_1));
+      return tryBasenameNoCwlExtension(option_1);
     } else {
       return void 0;
     }
@@ -236,9 +268,9 @@ function getRunPathCandidates(workflowFilePath, runPath) {
     const normalizedRunPath = normalize(trimmedRunPath);
     let matchResult = void 0, workflowPath_1 = void 0;
     if (workflowFilePath != null) {
-      if (!isNullOrWhiteSpace(value(workflowFilePath))) {
+      if (!isNullOrWhiteSpace(workflowFilePath)) {
         matchResult = 0;
-        workflowPath_1 = value(workflowFilePath);
+        workflowPath_1 = workflowFilePath;
       } else {
         matchResult = 1;
       }
@@ -269,7 +301,7 @@ function resolveRunString(state, workflowFilePath, runPath) {
     if (matchValue != null) {
       const tryResolveRunPath = value(matchValue);
       const candidates = getRunPathCandidates(workflowFilePath, runPath);
-      const candidateKeys = Array_distinct(map(normalizePathKey, candidates), {
+      const candidateKeys = Array_distinct(map$1(normalizePathKey, candidates), {
         Equals: (x, y) => x === y,
         GetHashCode: (x) => stringHash(x) | 0
       });
@@ -284,51 +316,76 @@ function resolveRunString(state, workflowFilePath, runPath) {
             resolvedRun = [FSharpMap__get_Item(state.RunResolutionCache, pathKey), candidate];
           } else {
             const matchValue_1 = tryResolveRunPath(candidate);
+            let matchResult = void 0, tool = void 0, workflow = void 0, expressionTool = void 0, operation = void 0;
             if (matchValue_1 == null) {
+              matchResult = 4;
             } else {
-              switch (value(matchValue_1).tag) {
+              switch (matchValue_1.tag) {
                 case /* Workflow */
                 1: {
-                  const workflow = value(matchValue_1).fields[0];
-                  const run_1 = WorkflowStepRunOps_fromWorkflow(workflow);
-                  for (let idx_2 = 0; idx_2 <= candidateKeys.length - 1; idx_2++) {
-                    const key_1 = item(idx_2, candidateKeys);
-                    state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_1, run_1);
-                  }
-                  resolvedRun = [run_1, candidate];
+                  matchResult = 1;
+                  workflow = matchValue_1.fields[0];
                   break;
                 }
                 case /* ExpressionTool */
                 2: {
-                  const expressionTool = value(matchValue_1).fields[0];
-                  const run_2 = WorkflowStepRunOps_fromExpressionTool(expressionTool);
-                  for (let idx_3 = 0; idx_3 <= candidateKeys.length - 1; idx_3++) {
-                    const key_2 = item(idx_3, candidateKeys);
-                    state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_2, run_2);
-                  }
-                  resolvedRun = [run_2, candidate];
+                  matchResult = 2;
+                  expressionTool = matchValue_1.fields[0];
                   break;
                 }
                 case /* Operation */
                 3: {
-                  const operation = value(matchValue_1).fields[0];
-                  const run_3 = WorkflowStepRunOps_fromOperation(operation);
-                  for (let idx_4 = 0; idx_4 <= candidateKeys.length - 1; idx_4++) {
-                    const key_3 = item(idx_4, candidateKeys);
-                    state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_3, run_3);
-                  }
-                  resolvedRun = [run_3, candidate];
+                  matchResult = 3;
+                  operation = matchValue_1.fields[0];
+                  break;
+                }
+                case /* RawProcess */
+                4: {
+                  matchResult = 4;
                   break;
                 }
                 default: {
-                  const tool = value(matchValue_1).fields[0];
-                  const run = WorkflowStepRunOps_fromTool(tool);
-                  for (let idx_1 = 0; idx_1 <= candidateKeys.length - 1; idx_1++) {
-                    const key = item(idx_1, candidateKeys);
-                    state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key, run);
-                  }
-                  resolvedRun = [run, candidate];
+                  matchResult = 0;
+                  tool = matchValue_1.fields[0];
+                }
+              }
+            }
+            switch (matchResult) {
+              case 0: {
+                const run = WorkflowStepRunOps_fromTool(tool);
+                for (let idx_1 = 0; idx_1 <= candidateKeys.length - 1; idx_1++) {
+                  const key = item(idx_1, candidateKeys);
+                  state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key, run);
                 }
+                resolvedRun = [run, candidate];
+                break;
+              }
+              case 1: {
+                const run_1 = WorkflowStepRunOps_fromWorkflow(workflow);
+                for (let idx_2 = 0; idx_2 <= candidateKeys.length - 1; idx_2++) {
+                  const key_1 = item(idx_2, candidateKeys);
+                  state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_1, run_1);
+                }
+                resolvedRun = [run_1, candidate];
+                break;
+              }
+              case 2: {
+                const run_2 = WorkflowStepRunOps_fromExpressionTool(expressionTool);
+                for (let idx_3 = 0; idx_3 <= candidateKeys.length - 1; idx_3++) {
+                  const key_2 = item(idx_3, candidateKeys);
+                  state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_2, run_2);
+                }
+                resolvedRun = [run_2, candidate];
+                break;
+              }
+              case 3: {
+                const run_3 = WorkflowStepRunOps_fromOperation(operation);
+                for (let idx_4 = 0; idx_4 <= candidateKeys.length - 1; idx_4++) {
+                  const key_3 = item(idx_4, candidateKeys);
+                  state.RunResolutionCache = FSharpMap__Add(state.RunResolutionCache, key_3, run_3);
+                }
+                resolvedRun = [run_3, candidate];
+                break;
               }
             }
           }
@@ -338,7 +395,7 @@ function resolveRunString(state, workflowFilePath, runPath) {
         addDiagnostic(state, GraphIssueKind.ResolutionFailed, concat("Unable to resolve CWL run reference '", runPath, "'."), workflowFilePath, runPath);
         return new RunResolutionResult(WorkflowStepRun_RunString(runPath), void 0, true, candidateKeys);
       } else {
-        return new RunResolutionResult(value(resolvedRun)[0], value(resolvedRun)[1], true, candidateKeys);
+        return new RunResolutionResult(resolvedRun[0], resolvedRun[1], true, candidateKeys);
       }
     } else {
       if (state.Options.StrictUnresolvedRunReferences) {
@@ -349,90 +406,102 @@ function resolveRunString(state, workflowFilePath, runPath) {
   }
 }
 function buildProcessingUnit(state, scope, workflowFilePath, ownerNodeId, isRoot, processingUnit) {
-  let option_9 = void 0, option_11 = void 0, option_13 = void 0, option_15 = void 0, option_17 = void 0, option_19 = void 0, option_1 = void 0, option_5 = void 0, option_3 = void 0, option_7 = void 0;
+  let option_15 = void 0, option_13 = void 0, option_17 = void 0, option_21 = void 0, option_19 = void 0, option_23 = void 0, option_27 = void 0, option_25 = void 0, option_29 = void 0, option_31 = void 0, option_33 = void 0, option_3 = void 0, option_1 = void 0, option_9 = void 0, option_7 = void 0, option_5 = void 0, option_11 = void 0;
   switch (processingUnit.tag) {
     case /* ExpressionTool */
     2: {
       const expressionTool = processingUnit.fields[0];
-      const nodeId_1 = addProcessingUnitNode(state, scope, ProcessingUnitKind.ExpressionTool, chooseLabel("ExpressionTool", ofArray([tryGetProcessingUnitName(expressionTool), (option_9 = expressionTool.Label, option_9 != null ? tryBasenameNoCwlExtension(value(option_9)) : void 0), (option_11 = workflowFilePath, option_11 != null ? tryBasenameNoCwlExtension(value(option_11)) : void 0)])), ownerNodeId, void 0, createMetadata(ofArray([["cwlVersion", some(expressionTool.CWLVersion)], ["expression", some(expressionTool.Expression)]])));
+      const nodeId_1 = addProcessingUnitNode(state, scope, ProcessingUnitKind.ExpressionTool, chooseLabel("ExpressionTool", ofArray([tryGetProcessingUnitName(expressionTool), (option_15 = (option_13 = expressionTool.Label, option_13 != null ? SchemaSaladStringModule_tryLiteral(option_13) : void 0), option_15 != null ? tryBasenameNoCwlExtension(option_15) : void 0), (option_17 = workflowFilePath, option_17 != null ? tryBasenameNoCwlExtension(option_17) : void 0)])), ownerNodeId, void 0, createMetadata(ofArray([["cwlVersion", some(expressionTool.CWLVersion)], ["expression", some(expressionTool.Expression.AsDirectiveString)]])));
       addExpressionToolPorts(state, nodeId_1, expressionTool);
       return nodeId_1;
     }
     case /* Operation */
     3: {
       const operation = processingUnit.fields[0];
-      const nodeId_2 = addProcessingUnitNode(state, scope, ProcessingUnitKind.Operation, chooseLabel("Operation", ofArray([tryGetProcessingUnitName(operation), (option_13 = operation.Label, option_13 != null ? tryBasenameNoCwlExtension(value(option_13)) : void 0), (option_15 = workflowFilePath, option_15 != null ? tryBasenameNoCwlExtension(value(option_15)) : void 0)])), ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(operation.CWLVersion)])));
+      const nodeId_2 = addProcessingUnitNode(state, scope, ProcessingUnitKind.Operation, chooseLabel("Operation", ofArray([tryGetProcessingUnitName(operation), (option_21 = (option_19 = operation.Label, option_19 != null ? SchemaSaladStringModule_tryLiteral(option_19) : void 0), option_21 != null ? tryBasenameNoCwlExtension(option_21) : void 0), (option_23 = workflowFilePath, option_23 != null ? tryBasenameNoCwlExtension(option_23) : void 0)])), ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(operation.CWLVersion)])));
       addOperationPorts(state, nodeId_2, operation);
       return nodeId_2;
     }
     case /* Workflow */
     1: {
       const workflow = processingUnit.fields[0];
-      const nodeId_3 = addProcessingUnitNode(state, scope, ProcessingUnitKind.Workflow, chooseLabel("Workflow", ofArray([tryGetProcessingUnitName(workflow), (option_17 = workflow.Label, option_17 != null ? tryBasenameNoCwlExtension(value(option_17)) : void 0), (option_19 = workflowFilePath, option_19 != null ? tryBasenameNoCwlExtension(value(option_19)) : void 0)])), ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(workflow.CWLVersion)])));
+      const label_3 = chooseLabel("Workflow", ofArray([tryGetProcessingUnitName(workflow), (option_27 = (option_25 = workflow.Label, option_25 != null ? SchemaSaladStringModule_tryLiteral(option_25) : void 0), option_27 != null ? tryBasenameNoCwlExtension(option_27) : void 0), (option_29 = workflowFilePath, option_29 != null ? tryBasenameNoCwlExtension(option_29) : void 0)]));
+      const nodeId_3 = addProcessingUnitNode(state, scope, ProcessingUnitKind.Workflow, label_3, ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(workflow.CWLVersion)])));
       addWorkflowPorts(state, nodeId_3, workflow);
       if (isRoot ? true : state.Options.ExpandNestedWorkflows) {
-        buildWorkflowSteps(state, scope, workflowFilePath, nodeId_3, workflow);
+        if (exists((right) => CWLProcessingUnit.isSameObject(processingUnit, right), state.ActiveWorkflows)) {
+          addDiagnostic(state, GraphIssueKind.CycleDetected, concat("Cycle detected: the workflow '", label_3, "' runs itself through its steps."), workflowFilePath, void 0);
+        } else {
+          const previousWorkflows = state.ActiveWorkflows;
+          state.ActiveWorkflows = cons(processingUnit, previousWorkflows);
+          try {
+            buildWorkflowSteps(state, scope, workflowFilePath, nodeId_3, workflow);
+          } finally {
+            state.ActiveWorkflows = previousWorkflows;
+          }
+        }
       }
       return nodeId_3;
     }
+    case /* RawProcess */
+    4:
+      return addProcessingUnitNode(state, scope, ProcessingUnitKind.ExternalReference, chooseLabel("Process with a directive as its class", ofArray([(option_31 = RawYaml__TryScalarField_Z721C83C5(processingUnit.fields[0], "id"), option_31 != null ? tryBasenameNoCwlExtension(option_31) : void 0), (option_33 = workflowFilePath, option_33 != null ? tryBasenameNoCwlExtension(option_33) : void 0)])), ownerNodeId, void 0, void 0);
     default: {
       const tool = processingUnit.fields[0];
-      const nodeId = addProcessingUnitNode(state, scope, ProcessingUnitKind.CommandLineTool, chooseLabel("CommandLineTool", ofArray([tryGetProcessingUnitName(tool), (option_1 = tool.Label, option_1 != null ? tryBasenameNoCwlExtension(value(option_1)) : void 0), (option_5 = (option_3 = tool.BaseCommand, option_3 != null ? tryHead(value(option_3)) : void 0), option_5 != null ? tryBasenameNoCwlExtension(value(option_5)) : void 0), (option_7 = workflowFilePath, option_7 != null ? tryBasenameNoCwlExtension(value(option_7)) : void 0)])), ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(tool.CWLVersion)])));
+      const nodeId = addProcessingUnitNode(state, scope, ProcessingUnitKind.CommandLineTool, chooseLabel("CommandLineTool", ofArray([tryGetProcessingUnitName(tool), (option_3 = (option_1 = tool.Label, option_1 != null ? SchemaSaladStringModule_tryLiteral(option_1) : void 0), option_3 != null ? tryBasenameNoCwlExtension(option_3) : void 0), (option_9 = (option_7 = (option_5 = tool.BaseCommand, option_5 != null ? tryHead(option_5) : void 0), option_7 != null ? SchemaSaladStringModule_tryLiteral(option_7) : void 0), option_9 != null ? tryBasenameNoCwlExtension(option_9) : void 0), (option_11 = workflowFilePath, option_11 != null ? tryBasenameNoCwlExtension(option_11) : void 0)])), ownerNodeId, void 0, createMetadata(singleton(["cwlVersion", some(tool.CWLVersion)])));
       addToolPorts(state, nodeId, tool);
       return nodeId;
     }
   }
 }
 function buildRunNode(state, runScope, stepNodeId, workflowFilePath, run) {
-  let currentPath = void 0;
+  let option_1 = void 0, currentPath = void 0;
+  let matchResult = void 0, runPath = void 0;
   switch (run.tag) {
-    case /* RunCommandLineTool */
+    case /* RunImport */
     1: {
-      const matchValue_2 = WorkflowStepRunOps_tryGetTool(run);
-      if (matchValue_2 == null) {
-        const badNodeId = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid CommandLineTool payload", stepNodeId, void 0, void 0);
-        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunCommandLineTool had an unexpected payload type.", workflowFilePath, void 0);
-        return [run, badNodeId];
-      } else {
-        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_CommandLineTool(value(matchValue_2)))];
-      }
+      matchResult = 0;
+      runPath = run.fields[0];
+      break;
     }
-    case /* RunWorkflow */
+    case /* RunMixed */
     2: {
-      const matchValue_3 = WorkflowStepRunOps_tryGetWorkflow(run);
-      if (matchValue_3 == null) {
-        const badNodeId_1 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid Workflow payload", stepNodeId, void 0, void 0);
-        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunWorkflow had an unexpected payload type.", workflowFilePath, void 0);
-        return [run, badNodeId_1];
-      } else {
-        const workflow = value(matchValue_3);
-        return [run, buildProcessingUnit(state, runScope, (currentPath = defaultArg(workflowFilePath, ""), isNullOrWhiteSpace(currentPath) ? void 0 : currentPath), stepNodeId, false, CWLProcessingUnit_Workflow(workflow))];
-      }
+      matchResult = 1;
+      break;
     }
-    case /* RunExpressionTool */
+    case /* RunRaw */
     3: {
-      const matchValue_4 = WorkflowStepRunOps_tryGetExpressionTool(run);
-      if (matchValue_4 == null) {
-        const badNodeId_2 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid ExpressionTool payload", stepNodeId, void 0, void 0);
-        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunExpressionTool had an unexpected payload type.", workflowFilePath, void 0);
-        return [run, badNodeId_2];
-      } else {
-        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_ExpressionTool(value(matchValue_4)))];
-      }
+      matchResult = 2;
+      break;
     }
-    case /* RunOperation */
+    case /* RunCommandLineTool */
     4: {
-      const matchValue_5 = WorkflowStepRunOps_tryGetOperation(run);
-      if (matchValue_5 == null) {
-        const badNodeId_3 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid Operation payload", stepNodeId, void 0, void 0);
-        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunOperation had an unexpected payload type.", workflowFilePath, void 0);
-        return [run, badNodeId_3];
-      } else {
-        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_Operation(value(matchValue_5)))];
-      }
+      matchResult = 3;
+      break;
+    }
+    case /* RunWorkflow */
+    5: {
+      matchResult = 4;
+      break;
+    }
+    case /* RunExpressionTool */
+    6: {
+      matchResult = 5;
+      break;
+    }
+    case /* RunOperation */
+    7: {
+      matchResult = 6;
+      break;
     }
     default: {
-      const resolution = resolveRunString(state, workflowFilePath, run.fields[0]);
+      matchResult = 0;
+      runPath = run.fields[0];
+    }
+  }
+  switch (matchResult) {
+    case 0: {
+      const resolution = resolveRunString(state, workflowFilePath, runPath);
       const matchValue = resolution.ResolvedRun;
       if (matchValue.tag === /* RunString */
       0) {
@@ -448,7 +517,7 @@ function buildRunNode(state, runScope, stepNodeId, workflowFilePath, run) {
           if (matchValue_1 == null) {
             patternInput = buildRunNode(state, runScope, stepNodeId, resolution.ResolvedFromPath, resolvedRun);
           } else {
-            const resolvedPathKey = normalizePathKey(value(matchValue_1));
+            const resolvedPathKey = normalizePathKey(matchValue_1);
             const previousStack = state.RunResolutionStack;
             state.RunResolutionStack = FSharpSet__Add(previousStack, resolvedPathKey);
             try {
@@ -465,36 +534,81 @@ function buildRunNode(state, runScope, stepNodeId, workflowFilePath, run) {
           }
           return [patternInput[0], builtNodeId];
         } else {
-          return [resolvedRun, value(cachedRunNodeId)];
+          return [resolvedRun, cachedRunNodeId];
         }
       }
     }
+    case 1:
+      return [run, addProcessingUnitNode(state, runScope, ProcessingUnitKind.ExternalReference, "Process with a mixin", stepNodeId, void 0, void 0)];
+    case 2:
+      return [run, addProcessingUnitNode(state, runScope, ProcessingUnitKind.ExternalReference, chooseLabel("Process with a directive as its class", singleton((option_1 = RawYaml__TryScalarField_Z721C83C5(run.fields[0], "id"), option_1 != null ? tryBasenameNoCwlExtension(option_1) : void 0))), stepNodeId, void 0, void 0)];
+    case 3: {
+      const matchValue_2 = WorkflowStepRunOps_tryGetTool(run);
+      if (matchValue_2 == null) {
+        const badNodeId = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid CommandLineTool payload", stepNodeId, void 0, void 0);
+        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunCommandLineTool had an unexpected payload type.", workflowFilePath, void 0);
+        return [run, badNodeId];
+      } else {
+        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_CommandLineTool(matchValue_2))];
+      }
+    }
+    case 4: {
+      const matchValue_3 = WorkflowStepRunOps_tryGetWorkflow(run);
+      if (matchValue_3 == null) {
+        const badNodeId_1 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid Workflow payload", stepNodeId, void 0, void 0);
+        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunWorkflow had an unexpected payload type.", workflowFilePath, void 0);
+        return [run, badNodeId_1];
+      } else {
+        const workflow = matchValue_3;
+        return [run, buildProcessingUnit(state, runScope, (currentPath = defaultArg(workflowFilePath, ""), isNullOrWhiteSpace(currentPath) ? void 0 : currentPath), stepNodeId, false, CWLProcessingUnit_Workflow(workflow))];
+      }
+    }
+    case 5: {
+      const matchValue_4 = WorkflowStepRunOps_tryGetExpressionTool(run);
+      if (matchValue_4 == null) {
+        const badNodeId_2 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid ExpressionTool payload", stepNodeId, void 0, void 0);
+        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunExpressionTool had an unexpected payload type.", workflowFilePath, void 0);
+        return [run, badNodeId_2];
+      } else {
+        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_ExpressionTool(matchValue_4))];
+      }
+    }
+    default: {
+      const matchValue_5 = WorkflowStepRunOps_tryGetOperation(run);
+      if (matchValue_5 == null) {
+        const badNodeId_3 = addProcessingUnitNode(state, runScope, ProcessingUnitKind.UnresolvedReference, "Invalid Operation payload", stepNodeId, void 0, void 0);
+        addDiagnostic(state, GraphIssueKind.UnexpectedRuntimeType, "WorkflowStepRun.RunOperation had an unexpected payload type.", workflowFilePath, void 0);
+        return [run, badNodeId_3];
+      } else {
+        return [run, buildProcessingUnit(state, runScope, workflowFilePath, stepNodeId, false, CWLProcessingUnit_Operation(matchValue_5))];
+      }
+    }
   }
 }
-function wireStepInputs(state, scope, workflowNodeId, step) {
-  const stepNodeId = GraphId_stepNodeId(scope, step.Id);
-  let enumerator = getEnumerator(step.In);
+function wireStepInputs(state, scope, workflowNodeId, workflowId, identity, step) {
+  let enumerator = getEnumerator(WorkflowStep.getInputValues(step));
   try {
     while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
       const stepInput = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-      const targetInputPortId = GraphId_portNodeId(stepNodeId, PortDirection.Input, stepInput.Id);
+      const targetInputPortId = GraphId_portNodeId(identity.NodeId, PortDirection.Input, ReferenceParsing_relativeId(step.Id, stepInput.Id));
       const matchValue = stepInput.Source;
       if (matchValue != null) {
-        let enumerator_1 = getEnumerator(value(matchValue));
+        const sources = matchValue;
+        const enumerator_1 = getEnumerator(choose(SchemaSaladStringModule_tryLiteral, sources.AsValues()));
         try {
           while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
-            const source = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
-            const sourceRef = ReferenceParsing_parseSourceReference(source);
+            const source_1 = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
+            const sourceRef = ReferenceParsing_parseSourceReference(ReferenceParsing_relativeId(workflowId, source_1));
             if (isNullOrWhiteSpace(sourceRef.PortId)) {
-              addDiagnostic(state, GraphIssueKind.InvalidReference, `Step '${step.Id}' input '${stepInput.Id}' has invalid source '${source}'.`, scope, source);
+              addDiagnostic(state, GraphIssueKind.InvalidReference, `Step '${identity.Name}' input '${stepInput.Id}' has invalid source '${source_1}'.`, scope, source_1);
             } else {
               let sourcePortId;
               const matchValue_1 = sourceRef.StepId;
-              sourcePortId = matchValue_1 == null ? GraphId_portNodeId(workflowNodeId, PortDirection.Input, sourceRef.PortId) : GraphId_portNodeId(GraphId_stepNodeId(scope, value(matchValue_1)), PortDirection.Output, sourceRef.PortId);
+              sourcePortId = matchValue_1 == null ? GraphId_portNodeId(workflowNodeId, PortDirection.Input, sourceRef.PortId) : GraphId_portNodeId(GraphId_stepNodeId(scope, matchValue_1), PortDirection.Output, sourceRef.PortId);
               if (hasNode(state, sourcePortId) && hasNode(state, targetInputPortId)) {
                 addEdgeByType(state, sourceRef.StepId == null ? EdgeKind.BindsWorkflowInput : EdgeKind.DataFlow, sourcePortId, targetInputPortId, void 0);
               } else {
-                addDiagnostic(state, GraphIssueKind.MissingReference, `Unable to wire source '${source}' to step input '${step.Id}/${stepInput.Id}'.`, scope, source);
+                addDiagnostic(state, GraphIssueKind.MissingReference, `Unable to wire source '${source_1}' to step input '${identity.Name}/${stepInput.Id}'.`, scope, source_1);
               }
             }
           }
@@ -508,22 +622,23 @@ function wireStepInputs(state, scope, workflowNodeId, step) {
   }
 }
 function wireWorkflowOutputs(state, scope, workflowNodeId, workflow) {
-  let enumerator = getEnumerator(workflow.Outputs);
+  let enumerator = getEnumerator(CWLWorkflowDescription.getOutputValues(workflow));
   try {
     while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
       const output = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+      const outputName = ReferenceParsing_relativeId(workflow.Id, output.Name);
       let enumerator_1 = getEnumerator(output.GetOutputSources());
       try {
         while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
           const outputSource = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
-          const parsedSource = ReferenceParsing_parseSourceReference(outputSource);
+          const parsedSource = ReferenceParsing_parseSourceReference(ReferenceParsing_relativeId(workflow.Id, outputSource));
           if (isNullOrWhiteSpace(parsedSource.PortId)) {
             addDiagnostic(state, GraphIssueKind.InvalidReference, `Workflow output '${output.Name}' has invalid outputSource '${outputSource}'.`, scope, outputSource);
           } else {
             let sourcePortId;
             const matchValue = parsedSource.StepId;
-            sourcePortId = matchValue == null ? GraphId_portNodeId(workflowNodeId, PortDirection.Input, parsedSource.PortId) : GraphId_portNodeId(GraphId_stepNodeId(scope, value(matchValue)), PortDirection.Output, parsedSource.PortId);
-            const targetPortId = GraphId_portNodeId(workflowNodeId, PortDirection.Output, output.Name);
+            sourcePortId = matchValue == null ? GraphId_portNodeId(workflowNodeId, PortDirection.Input, parsedSource.PortId) : GraphId_portNodeId(GraphId_stepNodeId(scope, matchValue), PortDirection.Output, parsedSource.PortId);
+            const targetPortId = GraphId_portNodeId(workflowNodeId, PortDirection.Output, outputName);
             if (hasNode(state, sourcePortId) && hasNode(state, targetPortId)) {
               addEdgeByType(state, EdgeKind.BindsWorkflowOutput, sourcePortId, targetPortId, void 0);
             } else {
@@ -540,20 +655,31 @@ function wireWorkflowOutputs(state, scope, workflowNodeId, workflow) {
   }
 }
 function buildWorkflowSteps(state, scope, workflowFilePath, workflowNodeId, workflow) {
-  let enumerator = getEnumerator(workflow.Steps);
+  const steps = toList(choose((tupledArg) => {
+    let step = void 0;
+    const option_1 = ListEntry$1.tryValue(tupledArg[1]);
+    if (option_1 != null) {
+      return step = option_1, [step, stepIdentity(scope, workflow.Id, tupledArg[0], step)];
+    } else {
+      return void 0;
+    }
+  }, indexed(workflow.Steps)));
+  const enumerator = getEnumerator(steps);
   try {
     while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
-      const step = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-      const stepNodeId = addStepNode(state, scope, workflowNodeId, step);
-      addStepPorts(state, stepNodeId, step);
-      addEdgeByType(state, EdgeKind.Calls, stepNodeId, buildRunNode(state, GraphId_childScope(scope, concat(step.Id, "/run")), stepNodeId, workflowFilePath, step.Run)[1], "calls");
+      const forLoopVar = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+      const step_1 = forLoopVar[0];
+      const identity = forLoopVar[1];
+      const stepNodeId = addStepNode(state, workflowNodeId, identity, step_1);
+      addStepPorts(state, stepNodeId, step_1);
+      addEdgeByType(state, EdgeKind.Calls, stepNodeId, buildRunNode(state, GraphId_childScope(scope, identity.RunSegment), stepNodeId, workflowFilePath, WorkflowStep.getResolvedRun(step_1))[1], "calls");
     }
   } finally {
     disposeSafe(enumerator);
   }
-  iterate((step_1) => {
-    wireStepInputs(state, scope, workflowNodeId, step_1);
-  }, workflow.Steps);
+  iterate$1((tupledArg_1) => {
+    wireStepInputs(state, scope, workflowNodeId, workflow.Id, tupledArg_1[1], tupledArg_1[0]);
+  }, steps);
   wireWorkflowOutputs(state, scope, workflowNodeId, workflow);
 }
 function buildWith(options, processingUnit) {
@@ -567,4 +693,4 @@ function build(processingUnit) {
   return buildWith(WorkflowGraphBuildOptionsModule_defaultOptions, processingUnit);
 }
 
-export { BuildState, BuildState_$reflection, RunResolutionResult, RunResolutionResult_$reflection, addDiagnostic, addEdge, addEdgeByType, addExpressionToolPorts, addNode, addOperationPorts, addPortNode, addProcessingUnitNode, addStepNode, addStepPorts, addToolPorts, addWorkflowPorts, build, buildProcessingUnit, buildRunNode, buildWith, buildWorkflowSteps, chooseLabel, createGraph, createMetadata, createState, getRunPathCandidates, hasNode, isCwlReference, resolveRunString, trimToNameCandidate, tryBasenameNoCwlExtension, tryGetProcessingUnitName, wireStepInputs, wireWorkflowOutputs };
+export { BuildState, BuildState_$reflection, RunResolutionResult, RunResolutionResult_$reflection, StepIdentity, StepIdentity_$reflection, addDiagnostic, addEdge, addEdgeByType, addExpressionToolPorts, addNode, addOperationPorts, addPortNode, addProcessingUnitNode, addStepNode, addStepPorts, addToolPorts, addWorkflowPorts, build, buildProcessingUnit, buildRunNode, buildWith, buildWorkflowSteps, chooseLabel, createGraph, createMetadata, createState, getRunPathCandidates, hasNode, isCwlReference, resolveRunString, stepIdentity, trimToNameCandidate, tryBasenameNoCwlExtension, tryGetProcessingUnitName, wireStepInputs, wireWorkflowOutputs };