move requirement defaults

Author: caroott

src/CWL/Requirements.fs

@@ -82,18 +82,34 @@ type LoadListingRequirementValue = {
     LoadListing: LoadListingEnum
 }
 
+    with
+    static member defaultNoListing =
+        { LoadListing = NoListing }
+
 type WorkReuseRequirementValue = {
     EnableReuse: bool
 }
 
+    with
+    static member defaultEnabled =
+        { EnableReuse = true }
+
 type NetworkAccessRequirementValue = {
     NetworkAccess: bool
 }
 
+    with
+    static member defaultEnabled =
+        { NetworkAccess = true }
+
 type InplaceUpdateRequirementValue = {
     InplaceUpdate: bool
 }
 
+    with
+    static member defaultEnabled =
+        { InplaceUpdate = true }
+
 type ToolTimeLimitValue =
     | ToolTimeLimitSeconds of int64
     | ToolTimeLimitExpression of string
@@ -170,6 +186,10 @@ type InlineJavascriptRequirementValue = {
     ExpressionLib: ResizeArray<string> option
 }
 
+    with
+    static member defaultEmpty =
+        { ExpressionLib = None }
+
 type HintUnknownValue = {
     Class: string option
     Raw: YAMLElement
@@ -212,6 +232,25 @@ type Requirement =
     /// Indicate that the workflow platform must support the valueFrom field of WorkflowStepInput.
     | StepInputExpressionRequirement
 
+    with
+    static member defaultInlineJavascriptRequirement =
+        InlineJavascriptRequirement InlineJavascriptRequirementValue.defaultEmpty
+
+    static member defaultLoadListingNoListing =
+        LoadListingRequirement LoadListingRequirementValue.defaultNoListing
+
+    static member defaultWorkReuseEnabled =
+        WorkReuseRequirement WorkReuseRequirementValue.defaultEnabled
+
+    static member defaultNetworkAccessEnabled =
+        NetworkAccessRequirement NetworkAccessRequirementValue.defaultEnabled
+
+    static member defaultInplaceUpdateEnabled =
+        InplaceUpdateRequirement InplaceUpdateRequirementValue.defaultEnabled
+
+    static member defaultToolTimeLimitSeconds(seconds: int64) =
+        ToolTimeLimitRequirement (ToolTimeLimitSeconds seconds)
+
 type HintEntry =
     | KnownHint of Requirement
     | UnknownHint of HintUnknownValue
@@ -231,17 +270,4 @@ type HintEntry =
         | KnownHint requirement -> Some requirement
         | UnknownHint _ -> None
 
-module RequirementDefaults =
-
-    let inlineJavascriptRequirement = InlineJavascriptRequirement { ExpressionLib = None }
-
-    let loadListingNoListing = LoadListingRequirement { LoadListing = NoListing }
-
-    let workReuseEnabled = WorkReuseRequirement { EnableReuse = true }
-
-    let networkAccessEnabled = NetworkAccessRequirement { NetworkAccess = true }
-
-    let inplaceUpdateEnabled = InplaceUpdateRequirement { InplaceUpdate = true }
-
-    let toolTimeLimitSeconds seconds = ToolTimeLimitRequirement (ToolTimeLimitSeconds seconds)
 

tests/CWL/CWLObject.Tests.fs

@@ -366,7 +366,7 @@ let testExpressionTool =
             let et = Decode.decodeExpressionTool TestObjects.CWL.ExpressionTool.expressionToolWithRequirementsFile
             Expect.equal et.CWLVersion "v1.2" ""
             let requirements = Expect.wantSome et.Requirements "Requirements should be present"
-            Expect.equal requirements.[0] RequirementDefaults.inlineJavascriptRequirement ""
+            Expect.equal requirements.[0] Requirement.defaultInlineJavascriptRequirement ""
             let inputs = Expect.wantSome et.Inputs "Inputs should be present"
             Expect.isTrue (inputs.Count > 0) "Should have at least one input"
             Expect.isTrue (et.Outputs.Count > 0) "Should have at least one output"

tests/CWL/Inputs.Tests.fs

@@ -176,7 +176,7 @@ let testProcessingUnitRequirementOps =
         testCase "getRequirements returns existing collection for all variants" <| fun _ ->
             let toolReqs = ResizeArray [| NetworkAccessRequirement { NetworkAccess = true } |]
             let workflowReqs = ResizeArray [| SubworkflowFeatureRequirement |]
-            let expressionReqs = ResizeArray [| RequirementDefaults.inlineJavascriptRequirement |]
+            let expressionReqs = ResizeArray [| Requirement.defaultInlineJavascriptRequirement |]
 
             let toolActual =
                 CWLToolDescription(outputs = ResizeArray(), requirements = toolReqs)
@@ -229,7 +229,7 @@ let testProcessingUnitHintOps =
             let workflowHints = CWLWorkflowDescription.getOrCreateHints workflow
             let expressionHints = CWLExpressionToolDescription.getOrCreateHints expressionTool
 
-            toolHints.Add(KnownHint RequirementDefaults.inlineJavascriptRequirement)
+            toolHints.Add(KnownHint Requirement.defaultInlineJavascriptRequirement)
             workflowHints.Add(UnknownHint { Class = Some "acme:Hint"; Raw = Decode.read "class: acme:Hint" })
             expressionHints.Add(KnownHint (NetworkAccessRequirement { NetworkAccess = true }))
 
@@ -240,7 +240,7 @@ let testProcessingUnitHintOps =
         testCase "getKnownHints drops unknown hints" <| fun _ ->
             let hints =
                 ResizeArray [|
-                    KnownHint RequirementDefaults.inlineJavascriptRequirement
+                    KnownHint Requirement.defaultInlineJavascriptRequirement
                     UnknownHint { Class = Some "acme:Hint"; Raw = Decode.read "class: acme:Hint" }
                     KnownHint (WorkReuseRequirement { EnableReuse = true })
                 |]

tests/CWL/Requirements.Tests.fs

@@ -1,4 +1,4 @@
-module Tests.Requirements
+module Tests.Requirements
 
 open ARCtrl.CWL
 open YAMLicious
@@ -124,7 +124,7 @@ outputs: {}"""
   - class: InlineJavascriptRequirement"""
                 let reqs = decodeRequirements yaml
                 let requirement = findRequirement reqs (function InlineJavascriptRequirement _ -> true | _ -> false)
-                Expect.equal requirement RequirementDefaults.inlineJavascriptRequirement "Class-only form should decode to empty payload"
+                Expect.equal requirement Requirement.defaultInlineJavascriptRequirement "Class-only form should decode to empty payload"
 
             testCase "Decode expressionLib form" <| fun _ ->
                 let yaml = """requirements:
@@ -152,7 +152,7 @@ outputs: {}"""
                 Expect.stringContains encoded "expressionLib" "Encoded output should include expressionLib"
 
             testCase "Encode omits expressionLib when absent" <| fun _ ->
-                let encoded = Encode.encodeRequirement RequirementDefaults.inlineJavascriptRequirement |> Encode.writeYaml
+                let encoded = Encode.encodeRequirement Requirement.defaultInlineJavascriptRequirement |> Encode.writeYaml
                 Expect.stringContains encoded "class: InlineJavascriptRequirement" "Encoded output should include class"
                 Expect.isFalse (encoded.Contains("expressionLib")) "Encoded output should omit expressionLib when absent"
 
@@ -1101,3 +1101,4 @@ let main =
         testRequirementEncode
         testInitialWorkDirFileDirectoryEntries
     ]
+