@nfdi4plants/arctrl 1.0.3 → 1.0.5

package/ISA/ISA/ArcTypes/ArcTable.js

@@ -568,10 +568,14 @@ export class ArcTable {
     static getRow(index) {
         return (table) => table.GetRow(index);
     }
-    Join(table, joinOptions, forceReplace, SkipFillMissing) {
+    Join(table, index, joinOptions, forceReplace, skipFillMissing) {
         const this$ = this;
         const joinOptions_1 = defaultArg(joinOptions, "headers");
         const forceReplace_1 = defaultArg(forceReplace, false);
+        const skipFillMissing_1 = defaultArg(skipFillMissing, true);
+        let index_1 = defaultArg(index, this$.ColumnCount);
+        index_1 = (((index_1 === -1) ? this$.ColumnCount : index_1) | 0);
+        SanityChecks_validateColumnIndex(index_1, this$.ColumnCount, true);
         const onlyHeaders = joinOptions_1 === "headers";
         let columns;
         const pre = table.Columns;
@@ -596,22 +600,21 @@ export class ArcTable {
         columns.forEach((x_2) => {
             SanityChecks_validateColumn(x_2);
         });
-        let index = this$.ColumnCount;
         columns.forEach((col) => {
             const prevHeadersCount = this$.Headers.length | 0;
-            Unchecked_addColumn(col.Header, col.Cells, index, forceReplace_1, onlyHeaders, this$.Headers, this$.Values);
+            Unchecked_addColumn(col.Header, col.Cells, index_1, forceReplace_1, onlyHeaders, this$.Headers, this$.Values);
             if (this$.Headers.length > prevHeadersCount) {
-                index = ((index + 1) | 0);
+                index_1 = ((index_1 + 1) | 0);
             }
         });
-        if (!equals(SkipFillMissing, true)) {
+        if (!skipFillMissing_1) {
             Unchecked_fillMissingCells(this$.Headers, this$.Values);
         }
     }
-    static join(table, joinOptions, forceReplace) {
+    static join(table, index, joinOptions, forceReplace) {
         return (this$) => {
             const copy = this$.Copy();
-            copy.Join(table, joinOptions, forceReplace);
+            copy.Join(table, index, joinOptions, forceReplace);
             return copy;
         };
     }

package/ISA/ISA.Json/ArcTypes/ArcAssay.js

@@ -177,6 +177,20 @@ export function ArcAssay_toJsonString(a) {
     return toString(2, Assay_encoder(ConverterOptions_$ctor(), a.ToAssay()));
 }
 
+export function ArcAssay_toArcJsonString(a) {
+    return toString(0, ArcAssay_encoder(a));
+}
+
+export function ArcAssay_fromArcJsonString(jsonString) {
+    const matchValue = fromString(uncurry2(ArcAssay_decoder), jsonString);
+    if (matchValue.tag === 1) {
+        return toFail(printf("Error. Unable to parse json string to ArcAssay: %s"))(matchValue.fields[0]);
+    }
+    else {
+        return matchValue.fields[0];
+    }
+}
+
 export function ARCtrl_ISA_ArcAssay__ArcAssay_fromArcJsonString_Static_Z721C83C5(jsonString) {
     const matchValue = fromString(uncurry2(ArcAssay_decoder), jsonString);
     if (matchValue.tag === 1) {

package/ISA/ISA.Json/ArcTypes/ArcInvestigation.js

@@ -59,6 +59,20 @@ export function ArcInvestigation_toJsonString(a) {
     return toString(2, encoder(ConverterOptions_$ctor(), a.ToInvestigation()));
 }
 
+export function ArcInvestigation_toArcJsonString(a) {
+    return toString(0, ArcInvestigation_encoder(a));
+}
+
+export function ArcInvestigation_fromArcJsonString(jsonString) {
+    const matchValue = fromString(uncurry2(ArcInvestigation_decoder), jsonString);
+    if (matchValue.tag === 1) {
+        return toFail(printf("Error. Unable to parse json string to ArcInvestigation: %s"))(matchValue.fields[0]);
+    }
+    else {
+        return matchValue.fields[0];
+    }
+}
+
 export function ARCtrl_ISA_ArcInvestigation__ArcInvestigation_fromArcJsonString_Static_Z721C83C5(jsonString) {
     const matchValue = fromString(uncurry2(ArcInvestigation_decoder), jsonString);
     if (matchValue.tag === 1) {

package/ISA/ISA.Json/ArcTypes/ArcStudy.js

@@ -57,6 +57,20 @@ export function ArcStudy_toJsonString(a, assays) {
     return toString(2, Study_encoder(ConverterOptions_$ctor(), a.ToStudy(assays)));
 }
 
+export function ArcStudy_toArcJsonString(a) {
+    return toString(0, ArcStudy_encoder(a));
+}
+
+export function ArcStudy_fromArcJsonString(jsonString) {
+    const matchValue = fromString(uncurry2(ArcStudy_decoder), jsonString);
+    if (matchValue.tag === 1) {
+        return toFail(printf("Error. Unable to parse json string to ArcStudy: %s"))(matchValue.fields[0]);
+    }
+    else {
+        return matchValue.fields[0];
+    }
+}
+
 export function ARCtrl_ISA_ArcStudy__ArcStudy_fromArcJsonString_Static_Z721C83C5(jsonString) {
     const matchValue = fromString(uncurry2(ArcStudy_decoder), jsonString);
     if (matchValue.tag === 1) {

package/README.md

@@ -6,7 +6,7 @@ and __JavaScript__! ❤️
 | Version | Downloads |
 | :--------|-----------:|
 |<a href="https://www.nuget.org/packages/ARCtrl/"><img alt="Nuget" src="https://img.shields.io/nuget/vpre/ARCtrl?logo=nuget&color=%234fb3d9"></a>|<a href="https://www.nuget.org/packages/ARCtrl/"><img alt="Nuget" src="https://img.shields.io/nuget/dt/ARCtrl?color=%234FB3D9"></a>|
-|<a href="https://www.npmjs.com/package/@nfdi4plants/arctrl"><img alt="NPM" src="https://img.shields.io/npm/v/%40nfdi4plants/arctrl/next?logo=npm&color=%234fb3d9"></a>|<a href="https://www.npmjs.com/package/@nfdi4plants/arctrl"><img alt="NPM" src="https://img.shields.io/npm/dt/%40nfdi4plants%2Farctrl?color=%234fb3d9"></a>|
+|<a href="https://www.npmjs.com/package/@nfdi4plants/arctrl"><img alt="NPM" src="https://img.shields.io/npm/v/%40nfdi4plants/arctrl?logo=npm&color=%234fb3d9"></a>|<a href="https://www.npmjs.com/package/@nfdi4plants/arctrl"><img alt="NPM" src="https://img.shields.io/npm/dt/%40nfdi4plants%2Farctrl?color=%234fb3d9"></a>|
 
 
 ## Install
@@ -48,7 +48,6 @@ Currently we provide some documentation in form of markdown files in the `/docs`
 ### Local Setup
 
 1. `dotnet tool restore`
-2. `dotnet paket install`
 3. `npm install`
 
 Verify correct setup with `./build.cmd runtests` ✨

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nfdi4plants/arctrl",
-  "version": "1.0.3+533dab0",
+  "version": "1.0.5+b21e3bc",
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "main": "index.js",