Update

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fable": {
-      "version": "4.13.0",
+      "version": "4.15.0",
       "commands": [
         "fable"
       ]

docs/scripts_js/ARC.js

@@ -1,12 +1,15 @@
 import {ARC} from "@nfdi4plants/arctrl";
-import {fulfillWriteContract, fulfillReadContract} from "./Contracts.js";
+import {fulfillWriteContract, fulfillReadContract, normalizePathSeparators} from "./Contracts.js";
+import {ArcInvestigation_toJsonString, ArcInvestigation_fromJsonString} from "@nfdi4plants/arctrl/ISA/ISA.Json/ArcTypes/ArcInvestigation.js"
+import fs from "fs";
+import path from "path";
 
 // # Create
 
 let arc = new ARC()
 
 // # Write
-const arcRootPath = "C:/Users/Kevin/Desktop/NewTestARCJS"
+const arcRootPath = "TestArc"
 
 async function write(arcPath, arc)  {
     let contracts = arc.GetWriteContracts()
@@ -16,15 +19,11 @@ async function write(arcPath, arc)  {
     };
 }
 
-await write(arcRootPath, arc)
+// await write(arcRootPath, arc)
 
 // # Read
 
 // Setup
-function normalizePathSeparators (str) {
-  const normalizedPath = path.normalize(str)
-  return normalizedPath.replace(/\\/g, '/');
-}
 
 export function getAllFilePaths(basePath) {
   const filesList = []
@@ -55,7 +54,7 @@ async function read(basePath) {
     let arc = ARC.fromFilePaths(allFilePaths)
     // Read contracts will tell us what we need to read from disc.
     let readContracts = arc.GetReadContracts()
-    console.log(readContracts)
+    // console.log(readContracts)
     let fcontracts = await Promise.all(
         readContracts.map(async (contract) => {
             let content = await fulfillReadContract(basePath, contract)
@@ -69,4 +68,8 @@ async function read(basePath) {
 
 // Execution
 
-await read(arcRootPath).then(arc => console.log(arc))
+await read(arcRootPath).then(arc => {
+  // let json = ArcInvestigation_toJsonString(arc.ISA)
+  // console.log(json)
+  console.log(arc)
+})

docs/scripts_js/ArcInvestigation.js

@@ -3,7 +3,7 @@ import { ArcInvestigation, Comment$ as Comment} from "@nfdi4plants/arctrl"
 import {Xlsx} from "@fslab/fsspreadsheet";
 // Import ARCtrl Investigation to Spreadsheet transformation
 import {toFsWorkbook, fromFsWorkbook} from "@nfdi4plants/arctrl/ISA/ISA.Spreadsheet/ArcInvestigation.js"
-import {ArcInvestigation_toJsonString, ArcInvestigation_fromJsonString} from "@nfdi4plants/arctrl/ISA/ISA.Json/Investigation.js"
+import {ArcInvestigation_toJsonString, ArcInvestigation_fromJsonString} from "@nfdi4plants/arctrl/ISA/ISA.Json/ArcTypes/ArcInvestigation.js"
 
 // # Comments
 
@@ -23,7 +23,7 @@ console.log(investigation_comments)
 
 let fswb = toFsWorkbook(investigation_comments)
 
-Xlsx.toFile("test.isa.investigation.xlsx", fswb)
+// Xlsx.toFile("test.isa.investigation.xlsx", fswb)
 
 // Json - Write
 

docs/scripts_js/Contracts.js

@@ -4,6 +4,12 @@ import path from "path";
 
 // Write
 
+export function normalizePathSeparators (str) {
+  const normalizedPath = path.normalize(str)
+  return normalizedPath.replace(/\\/g, '/');
+}
+
+
 export async function fulfillWriteContract (basePath, contract) {
     function ensureDirectory (filePath) {
         let dirPath = path.dirname(filePath)

docs/scripts_js/package.json

@@ -9,7 +9,7 @@
   "author": "Kevin Frey",
   "license": "MIT",
   "dependencies": {
-    "@nfdi4plants/arctrl": "^1.0.0-beta.9",
-    "@fslab/fsspreadsheet": "^5.0.0"
+    "@nfdi4plants/arctrl": "^1.2.0",
+    "@fslab/fsspreadsheet": "^6.0.1"
   }
 }

tests/ISA/ISA.Json.Tests/Json.Tests.fs

@@ -195,7 +195,6 @@ let testOntoloyAnnotationLD =
             )
     ]
 
-
 let testProcessInput =
 
     testList "ProcessInput" [