diff --git a/ARCtrl.sln b/ARCtrl.sln
index a7b85852..e2bba517 100644
--- a/ARCtrl.sln
+++ b/ARCtrl.sln
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\build-test.yml = .github\workflows\build-test.yml
build.cmd = build.cmd
build.sh = build.sh
- Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
.config\dotnet-tools.json = .config\dotnet-tools.json
global.json = global.json
diff --git a/Directory.Build.props b/Directory.Build.props
deleted file mode 100644
index 59119618..00000000
--- a/Directory.Build.props
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- true
- true
-
-
-
-
- 3
-
-
-
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a2c404b0..97925793 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,7 +12,7 @@
-
+
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 445be890..69401410 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -5,10 +5,10 @@
* [[#ef15f35](https://github.com/nfdi4plants/ARCtrl/commit/ef15f35779606a1bfcaecdadfc7532886466ec46)] implement first POC of ISA ROCrate profile
* [[#168ead8](https://github.com/nfdi4plants/ARCtrl/commit/168ead84ca93dc0fae911e760673ef6e33180447)] add test project
* [[#2cea57c](https://github.com/nfdi4plants/ARCtrl/commit/2cea57cc1415310e36f5931ef376ea183b85fb71)] update solution
- * [[#ccd1805](https://github.com/nfdi4plants/ARCtrl/commit/ccd18053a83c80f4ca4b7a2ac7008a4a0cf3d348)] Unify Inheritance to ROCrateObject
+ * [[#ccd1805](https://github.com/nfdi4plants/ARCtrl/commit/ccd18053a83c80f4ca4b7a2ac7008a4a0cf3d348)] Unify Inheritance to LDObject
* [[#95cab6f](https://github.com/nfdi4plants/ARCtrl/commit/95cab6f0f85f71a7adea887a25bd47c714e5af35)] wip ro-crate tests
* [[#9ef48d7](https://github.com/nfdi4plants/ARCtrl/commit/9ef48d75f5439d3a71ca943941b70c5af3ff9261)] only use primary constructor
- * [[#9deffb7](https://github.com/nfdi4plants/ARCtrl/commit/9deffb7ea81f76c067de5618f2b3388303402191)] Add basic tests for I/S/A ROCrateObjects
+ * [[#9deffb7](https://github.com/nfdi4plants/ARCtrl/commit/9deffb7ea81f76c067de5618f2b3388303402191)] Add basic tests for I/S/A LDObjects
* [[#4b4a2fc](https://github.com/nfdi4plants/ARCtrl/commit/4b4a2fcc3bd32b31ec5aa3b4f1127883f7af83fc)] temp workaround in tests for https://github.com/CSBiology/DynamicObj/issues/25
* [[#f67e78b](https://github.com/nfdi4plants/ARCtrl/commit/f67e78b068350a8e1aecf80fa8b9dd4646fb9ddd)] Use unblocking version of DynamicObj, introduce runTestProject target
* [[#4e91e9d](https://github.com/nfdi4plants/ARCtrl/commit/4e91e9dcc5b34747a2e4a16f33aee1a227eb08ef)] finish basic property tests for isa profile types
@@ -22,11 +22,11 @@
* [[#93030e9](https://github.com/nfdi4plants/ARCtrl/commit/93030e915329c23b4b4f8cddc5b622312de6cedb)] Make use of Fable.Package.SDK
* [[#99b2659](https://github.com/nfdi4plants/ARCtrl/commit/99b2659d1dd5c3815693f4df85691f9bead3e26d)] rename json IO implementations folder to reduce ambiguity in py and javascript packages
* Deletions:
- * [[#c71b8a3](https://github.com/nfdi4plants/ARCtrl/commit/c71b8a301fbdf95531a9ba0d33f8e6d0d238adc9)] correct interface implementation on ROCrateObject, remove interface implementation from Dataset
+ * [[#c71b8a3](https://github.com/nfdi4plants/ARCtrl/commit/c71b8a301fbdf95531a9ba0d33f8e6d0d238adc9)] correct interface implementation on LDObject, remove interface implementation from Dataset
* [[#c429686](https://github.com/nfdi4plants/ARCtrl/commit/c4296864a7443a990257f7eb47fed92458fa0a7b)] remove javascript and pyton packages from main solution
* [[#3586dee](https://github.com/nfdi4plants/ARCtrl/commit/3586dee6a736d3ad2ed9e79778e3ea136c638eac)] remove restorelockedmode flag
* Bugfixes:
- * [[#9d526b8](https://github.com/nfdi4plants/ARCtrl/commit/9d526b82df1d7ac04283cbe23c9832f1d5818771)] add LabProcess tests, fix schematype of ROCrateObject base constructor
+ * [[#9d526b8](https://github.com/nfdi4plants/ARCtrl/commit/9d526b82df1d7ac04283cbe23c9832f1d5818771)] add LabProcess tests, fix schematype of LDObject base constructor
* [[#192812d](https://github.com/nfdi4plants/ARCtrl/commit/192812d43569270845883ca116de9931dea6ba62)] fix error messages of ROCrate testing utils
* [[#43d65db](https://github.com/nfdi4plants/ARCtrl/commit/43d65db3fb121a4832e771541880c1fe79cfe89c)] various test fixes for Fable logic transition
* [[#8552f9e](https://github.com/nfdi4plants/ARCtrl/commit/8552f9ea7b2183c4cb382049c71793918d4128b3)] fix fable ready packaging and/by update package tags
diff --git a/src/ARCtrl/ARCtrl.Common.props b/src/ARCtrl/ARCtrl.Common.props
index 5633bf3f..963548e3 100644
--- a/src/ARCtrl/ARCtrl.Common.props
+++ b/src/ARCtrl/ARCtrl.Common.props
@@ -40,7 +40,7 @@
-
+
-->
diff --git a/src/ARCtrl/ARCtrl.Javascript.fsproj b/src/ARCtrl/ARCtrl.Javascript.fsproj
index e9a0dc3c..9a197d64 100644
--- a/src/ARCtrl/ARCtrl.Javascript.fsproj
+++ b/src/ARCtrl/ARCtrl.Javascript.fsproj
@@ -46,7 +46,7 @@
-
+
diff --git a/src/ARCtrl/ARCtrl.Python.fsproj b/src/ARCtrl/ARCtrl.Python.fsproj
index a404cc91..72204129 100644
--- a/src/ARCtrl/ARCtrl.Python.fsproj
+++ b/src/ARCtrl/ARCtrl.Python.fsproj
@@ -46,7 +46,7 @@
-
+
diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj
index 3a843e32..db129baf 100644
--- a/src/ARCtrl/ARCtrl.fsproj
+++ b/src/ARCtrl/ARCtrl.fsproj
@@ -45,7 +45,7 @@
-
+
diff --git a/src/ARCtrl/JsonIO/LDObject.fs b/src/ARCtrl/JsonIO/LDObject.fs
new file mode 100644
index 00000000..1a4fe343
--- /dev/null
+++ b/src/ARCtrl/JsonIO/LDObject.fs
@@ -0,0 +1,25 @@
+namespace ARCtrl.Json
+
+open ARCtrl
+open ARCtrl.ROCrate
+open System
+open ARCtrl.ROCrate
+open Thoth.Json.Core
+open DynamicObj
+
+[]
+module LDObjectExtensions =
+
+ type LDObject with
+
+ static member fromROCrateJsonString (s:string) =
+ Decode.fromJsonString LDObject.decoder s
+
+ /// exports in json-ld format
+ static member toROCrateJsonString(?spaces) =
+ fun (obj:LDObject) ->
+ LDObject.encoder obj
+ |> Encode.toJsonString (Encode.defaultSpaces spaces)
+
+ member this.ToROCrateJsonString(?spaces) =
+ LDObject.toROCrateJsonString(?spaces=spaces) this
\ No newline at end of file
diff --git a/src/ARCtrl/JsonIO/ROCrateObject.fs b/src/ARCtrl/JsonIO/ROCrateObject.fs
deleted file mode 100644
index 3d128634..00000000
--- a/src/ARCtrl/JsonIO/ROCrateObject.fs
+++ /dev/null
@@ -1,123 +0,0 @@
-namespace ARCtrl.Json
-
-open ARCtrl
-open System
-open ARCtrl.ROCrate
-open Thoth.Json.Core
-open DynamicObj
-
-module rec ROCrateObject =
-
- #if !FABLE_COMPILER
- let (|SomeObj|_|) =
- // create generalized option type
- let ty = typedefof