fix for new dynamic obj version

nfdi4plants · Oct 21, 2024 · 17fabe8 · 17fabe8
1 parent 7007a0b
commit 17fabe8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/src/CWL/CWLTypes.fs b/src/CWL/CWLTypes.fs
@@ -48,7 +48,7 @@ module CWLTypes =
     type SchemaDefRequirementType (types, definitions) as this =
         inherit DynamicObj ()
         do
-            DynObj.setValue this (nameof types) definitions
+            DynObj.setProperty (nameof types) definitions this
 
     type SoftwarePackage = {
         Package: string

diff --git a/src/CWL/Decode.fs b/src/CWL/Decode.fs
@@ -17,16 +17,17 @@ module Decode =
         for e in dict do
             match e.Value with
             | YAMLElement.Object [YAMLElement.Value v] -> 
-                DynObj.setValue dynObj e.Key v.Value
+                DynObj.setProperty e.Key v.Value dynObj
             | YAMLElement.Object [YAMLElement.Sequence s] ->
                 let newDynObj = new DynamicObj ()
                 (s |> List.map ((Decode.object (fun get ->  (get.Overflow.FieldList []))) >> overflowDecoder newDynObj))
                 |> List.iter (fun x ->
-                    DynObj.setValue
-                        dynObj
+                    DynObj.setProperty
                         e.Key
                         x
+                        dynObj
                 )
+            | _ -> DynObj.setProperty e.Key e.Value dynObj
         dynObj
 
     let outputBindingGlobDecoder: (YAMLiciousTypes.YAMLElement -> OutputBinding) =
@@ -118,7 +119,7 @@ module Decode =
                             cwlType
                         )
                     if outputBinding.IsSome then
-                        DynObj.setValueOpt output "outputBinding" outputBinding
+                        DynObj.setOptionalProperty "outputBinding" outputBinding output
                     output
             |]     
         )
@@ -291,7 +292,7 @@ module Decode =
                             cwlType
                         )
                     if inputBinding.IsSome then
-                        DynObj.setValueOpt input "inputBinding" inputBinding
+                        DynObj.setOptionalProperty "inputBinding" inputBinding input
                     input
             |]     
         )

diff --git a/src/CWL/Inputs.fs b/src/CWL/Inputs.fs
@@ -20,11 +20,11 @@ module Inputs =
     ) as this =
         inherit DynamicObj ()
         do
-            DynObj.setValueOpt this ("type") type_
-            DynObj.setValueOpt this ("inputBinding") inputBinding
+            DynObj.setOptionalProperty ("type") type_ this
+            DynObj.setOptionalProperty ("inputBinding") inputBinding this
         member this.Name = name
-        member this.Type = DynObj.tryGetTypedValue<CWLType> ("type") this
-        member this.InputBinding = DynObj.tryGetTypedValue<InputBinding> ("inputBinding") this
+        member this.Type = DynObj.tryGetTypedPropertyValue<CWLType> ("type") this
+        member this.InputBinding = DynObj.tryGetTypedPropertyValue<InputBinding> ("inputBinding") this
 
     module Workflow =
 

diff --git a/src/CWL/Outputs.fs b/src/CWL/Outputs.fs
@@ -16,11 +16,11 @@ module Outputs =
     ) as this =
         inherit DynamicObj ()
         do
-            DynObj.setValueOpt this ("type") type_
-            DynObj.setValueOpt this ("outputBinding") outputBinding
+            DynObj.setOptionalProperty ("type") type_ this
+            DynObj.setOptionalProperty ("outputBinding") outputBinding this
         member this.Name = name
-        member this.Type = DynObj.tryGetTypedValue<CWLType> ("type") this
-        member this.OutputBinding = DynObj.tryGetTypedValue<OutputBinding> ("outputBinding") this
+        member this.Type = DynObj.tryGetTypedPropertyValue<CWLType> ("type") this
+        member this.OutputBinding = DynObj.tryGetTypedPropertyValue<OutputBinding> ("outputBinding") this
 
     module Workflow =
 

diff --git a/src/CWL/Requirements.fs b/src/CWL/Requirements.fs
@@ -29,14 +29,14 @@ module Requirements =
     ) as this =
         inherit DynamicObj ()
         do
-            DynObj.setValueOpt this (nameof coresMin) coresMin
-            DynObj.setValueOpt this (nameof coresMax) coresMax
-            DynObj.setValueOpt this (nameof ramMin) ramMin
-            DynObj.setValueOpt this (nameof ramMax) ramMax
-            DynObj.setValueOpt this (nameof tmpdirMin) tmpdirMin
-            DynObj.setValueOpt this (nameof tmpdirMax) tmpdirMax
-            DynObj.setValueOpt this (nameof outdirMin) outdirMin
-            DynObj.setValueOpt this (nameof outdirMax) outdirMax
+            DynObj.setOptionalProperty (nameof coresMin) coresMin this
+            DynObj.setOptionalProperty (nameof coresMax) coresMax this
+            DynObj.setOptionalProperty (nameof ramMin) ramMin this
+            DynObj.setOptionalProperty (nameof ramMax) ramMax this
+            DynObj.setOptionalProperty (nameof tmpdirMin) tmpdirMin this
+            DynObj.setOptionalProperty (nameof tmpdirMax) tmpdirMax this
+            DynObj.setOptionalProperty (nameof outdirMin) outdirMin this
+            DynObj.setOptionalProperty (nameof outdirMax) outdirMax this
 
     type Requirement = 
         | InlineJavascriptRequirement