@nfdi4plants/arctrl 2.0.0-alpha.8 → 2.0.0-beta.1

package/Spreadsheet/ArcInvestigation.js

@@ -14,7 +14,7 @@ import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/OntologyS
 import { toRows as toRows_2, fromRows as fromRows_2 } from "./Metadata/Publication.js";
 import { toRows as toRows_3, fromRows as fromRows_3 } from "./Metadata/Contacts.js";
 import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js";
-import { iterateIndexed, map as map_1, toList, empty as empty_1, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { iterateIndexed, map as map_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { tryFind, ofList } from "../fable_modules/fable-library-js.4.16.0/Map.js";
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
@@ -239,12 +239,12 @@ export function fromRows(rows) {
     }
 }
 
-export function toRows(isLight, investigation) {
+export function toRows(investigation) {
     let remarks, rows;
-    return (remarks = ofSeq(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofSeq(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z720BD3FF(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofSeq(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofSeq(investigation.Contacts)), delay(() => (!isLight ? collect((studyIdentifier) => {
+    return (remarks = ofSeq(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofSeq(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z720BD3FF(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofSeq(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofSeq(investigation.Contacts)), delay(() => collect((studyIdentifier) => {
         const study = defaultArg(investigation.TryGetStudy(studyIdentifier), new ArcStudy(studyIdentifier));
         return append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_4(study, void 0)));
-    }, investigation.RegisteredStudyIdentifiers) : empty_1())))))))))))))))))), (() => {
+    }, investigation.RegisteredStudyIdentifiers)))))))))))))))))), (() => {
         try {
             const rm = ofList(map((remark) => Remark.toTuple(remark), remarks), {
                 Compare: comparePrimitives,
@@ -302,23 +302,7 @@ export function toFsWorkbook(investigation) {
         const sheet = new FsWorksheet("isa_investigation");
         iterateIndexed((rowI, r) => {
             SparseRowModule_writeToSheet(rowI + 1, r, sheet);
-        }, toRows(false, investigation));
-        wb.AddWorksheet(sheet);
-        return wb;
-    }
-    catch (err) {
-        const arg = err.message;
-        return toFail(printf("Could not write investigation to spreadsheet: %s"))(arg);
-    }
-}
-
-export function toLightFsWorkbook(investigation) {
-    try {
-        const wb = new FsWorkbook();
-        const sheet = new FsWorksheet("isa_investigation");
-        iterateIndexed((rowI, r) => {
-            SparseRowModule_writeToSheet(rowI + 1, r, sheet);
-        }, toRows(true, investigation));
+        }, toRows(investigation));
         wb.AddWorksheet(sheet);
         return wb;
     }

package/Xlsx.js

@@ -4,7 +4,7 @@ import { toFsWorkbook as toFsWorkbook_1, fromFsWorkbook as fromFsWorkbook_1 } fr
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7, ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D } from "./Spreadsheet/ArcStudy.js";
 import { map, unwrap } from "./fable_modules/fable-library-js.4.16.0/Option.js";
 import { ofSeq } from "./fable_modules/fable-library-js.4.16.0/List.js";
-import { toLightFsWorkbook, toFsWorkbook as toFsWorkbook_2, fromFsWorkbook as fromFsWorkbook_2 } from "./Spreadsheet/ArcInvestigation.js";
+import { toFsWorkbook as toFsWorkbook_2, fromFsWorkbook as fromFsWorkbook_2 } from "./Spreadsheet/ArcInvestigation.js";
 
 export class XlsxHelper_DatamapXlsx {
     constructor() {
@@ -72,9 +72,6 @@ export class XlsxHelper_InvestigationXlsx {
     toFsWorkbook(investigation) {
         return toFsWorkbook_2(investigation);
     }
-    toLightFsWorkbook(investigation) {
-        return toLightFsWorkbook(investigation);
-    }
 }
 
 export function XlsxHelper_InvestigationXlsx_$reflection() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nfdi4plants/arctrl",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-beta.1",
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "main": "index.js",