wip ro-crate tests

nfdi4plants · Sep 4, 2024 · 95cab6f · 95cab6f
1 parent ccd1805
commit 95cab6f
Show file tree

Hide file tree

Showing 22 changed files with 248 additions and 225 deletions.
diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs
@@ -16,6 +16,7 @@ let testProjects =
         "tests/Yaml"
         "tests/ValidationPackages"
         "tests/Contract"
+        "tests/ROCrate"
     ]
 
 /// Native JS test paths

diff --git a/src/ROCrate/ARCtrl.ROCrate.fsproj b/src/ROCrate/ARCtrl.ROCrate.fsproj
@@ -5,7 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="IROCrateObject.fs" />
+    <Compile Include="ROCrateObject.fs" />
     <Compile Include="ISAProfile\Dataset.fs" />
     <Compile Include="ISAProfile\Investigation.fs" />
     <Compile Include="ISAProfile\Study.fs" />
@@ -17,7 +17,6 @@
     <Compile Include="ISAProfile\PropertyValue.fs" />
     <Compile Include="ISAProfile\Person.fs" />
     <Compile Include="ISAProfile\ScholarlyArticle.fs" />
-    <Compile Include="ROCrateObject.fs" />
     <None Include="playground.fsx" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>

diff --git a/src/ROCrate/IROCrateObject.fs b/src/ROCrate/IROCrateObject.fs
diff --git a/src/ROCrate/ISAProfile/Data.fs b/src/ROCrate/ISAProfile/Data.fs
@@ -1,42 +1,23 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type Data(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "schema.org/MediaObject"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "schema.org/MediaObject", ?additionalType = additionalType)
 
     static member create(
         // mandatory
         id,
         name,
+        ?additionalType,
         ?comment,
         ?encodingFormat,
         ?disambiguatingDescription
     ) =
-        let d = Data(id)
+        let d = Data(id, ?additionalType = additionalType)
 
         DynObj.setValue d (nameof name) name
 

diff --git a/src/ROCrate/ISAProfile/Dataset.fs b/src/ROCrate/ISAProfile/Dataset.fs
@@ -1,26 +1,12 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type Dataset (id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "schema.org/Dataset"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
+    inherit ROCrateObject(id = id, schemaType = "schema.org/Dataset", ?additionalType = additionalType)
 
      //interface implementations
     interface IROCrateObject with 

diff --git a/src/ROCrate/ISAProfile/LabProcess.fs b/src/ROCrate/ISAProfile/LabProcess.fs
@@ -1,32 +1,13 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type LabProcess(id: string, ?additionalType: string) =
-    inherit DynamicObj()
 
-    let mutable _schemaType = "bioschemas.org/LabProcess"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "bioschemas.org/LabProcess", ?additionalType = additionalType)
 
     static member create(
         // mandatory
@@ -42,14 +23,13 @@ type LabProcess(id: string, ?additionalType: string) =
         ?endTime,
         ?disambiguatingDescription
     ) =
-        let lp = LabProcess(id)
+        let lp = LabProcess(id, ?additionalType = additionalType)
 
         DynObj.setValue lp (nameof name) name
         DynObj.setValue lp (nameof agent) agent
         DynObj.setValue lp (nameof object) object
         DynObj.setValue lp (nameof result) result
 
-        DynObj.setValueOpt lp (nameof additionalType) additionalType
         DynObj.setValueOpt lp (nameof executesLabProtocol) executesLabProtocol
         DynObj.setValueOpt lp (nameof parameterValue) parameterValue
         DynObj.setValueOpt lp (nameof endTime) endTime

diff --git a/src/ROCrate/ISAProfile/LabProtocol.fs b/src/ROCrate/ISAProfile/LabProtocol.fs
@@ -1,36 +1,17 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type LabProtocol(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "bioschemas.org/LabProtocol"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "bioschemas.org/LabProtocol", ?additionalType = additionalType)
 
     static member create(
         // mandatory
         id,
+        ?additionalType,
         ?name,
         ?intendedUse,
         ?description,
@@ -41,7 +22,7 @@ type LabProtocol(id: string, ?additionalType: string) =
         ?reagent,
         ?computationalTool
     ) =
-        let lp = LabProcess(id)
+        let lp = LabProcess(id, ?additionalType = additionalType)
 
         DynObj.setValueOpt lp (nameof name) name
         DynObj.setValueOpt lp (nameof intendedUse) intendedUse

diff --git a/src/ROCrate/ISAProfile/Person.fs b/src/ROCrate/ISAProfile/Person.fs
@@ -1,37 +1,18 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type Person(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "schema.org/Person"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "schema.org/Person", ?additionalType = additionalType)
 
     static member create(
         // mandatory
         id,
         givenName,
+        ?additionalType,
         ?familyName,
         ?email,
         ?identifier,
@@ -43,7 +24,7 @@ type Person(id: string, ?additionalType: string) =
         ?faxNumber,
         ?disambiguatingDescription
     ) =
-        let p = Person(id)
+        let p = Person(id, ?additionalType = additionalType)
 
         DynObj.setValue p (nameof givenName) givenName
 

diff --git a/src/ROCrate/ISAProfile/PropertyValue.fs b/src/ROCrate/ISAProfile/PropertyValue.fs
@@ -1,32 +1,12 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type PropertyValue(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "schema.org/PropertyValue"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "schema.org/PropertyValue", ?additionalType = additionalType)
 
     static member create(
         // mandatory

diff --git a/src/ROCrate/ISAProfile/Sample.fs b/src/ROCrate/ISAProfile/Sample.fs
@@ -1,41 +1,22 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type Sample(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "bioschemas.org/Sample"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-     //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "bioschemas.org/Sample", ?additionalType = additionalType)
 
     static member create(
         // mandatory
         id,
         name,
+        ?additionalType,
         ?additionalProperty,
         ?derivesFrom
     ) =
-        let s = Sample(id)
+        let s = Sample(id, ?additionalType = additionalType)
 
         DynObj.setValue s (nameof name) name
 

diff --git a/src/ROCrate/ISAProfile/ScholarlyArticle.fs b/src/ROCrate/ISAProfile/ScholarlyArticle.fs
@@ -1,44 +1,25 @@
-namespace ARCtrl.ROCrate
+namespace ARCtrl.ROCrate
 
 open DynamicObj
 open Fable.Core
 
 ///
 [<AttachMembers>]
 type ScholarlyArticle(id: string, ?additionalType: string) =
-    inherit DynamicObj()
-
-    let mutable _schemaType = "schema.org/ScholarlyArticle"
-    let mutable _additionalType = additionalType
-
-    member this.Id 
-        with get() = id
-
-    member this.SchemaType 
-        with get() = _schemaType
-        and set(value) = _schemaType <- value
-
-    member this.AdditionalType
-        with get() = _additionalType
-        and set(value) = _additionalType <- value
-
-    //interface implementations
-    interface IROCrateObject with 
-        member this.Id with get () = this.Id
-        member this.SchemaType with get (): string = this.SchemaType
-        member this.AdditionalType with get (): string option = this.AdditionalType
+    inherit ROCrateObject(id = id, schemaType = "schema.org/ScholarlyArticle", ?additionalType = additionalType)
 
     static member create(
         // mandatory
         id,
         headline,
         identifier,
+        ?additionalType,
         ?author,
         ?url,
         ?creativeWorkStatus,
         ?disambiguatingDescription
     ) =
-        let sa = ScholarlyArticle(id)
+        let sa = ScholarlyArticle(id, ?additionalType = additionalType)
 
         DynObj.setValue sa (nameof headline) headline
         DynObj.setValue sa (nameof identifier) identifier