@nfdi4plants/arctrl 1.0.0-alpha9 → 1.0.0-beta.2

package/README.md

@@ -1,277 +1,53 @@
 # ARCtrl
-Top level ARC DataModel and API function descriptions.
 
-- [ARCtrl](#arctrl)
-  - [Jargon/Nomenclature](#jargonnomenclature)
-  - [API Design](#api-design)
-  - [Top level overview](#top-level-overview)
-  - [Stack](#stack)
-- [Libraries](#libraries)
-  - [Design choices](#design-choices)
-    - [Fable compatibility as top priority](#fable-compatibility-as-top-priority)
+> **ARCtrl** the easy way to read, manipulate and write ARCs in __.NET__ 
+and __JavaScript__! ❤️
 
-## Sub-Libraries
+| Version | Downloads |
+| :--------|-----------:|
+|![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/ARCtrl?logo=nuget&color=%234fb3d9)|![Nuget](https://img.shields.io/nuget/dt/ARCtrl?color=%234FB3D9)|
+|![npm (scoped with tag)](https://img.shields.io/npm/v/%40nfdi4plants/arctrl/next?logo=npm&color=%234fb3d9)|![npm](https://img.shields.io/npm/dt/%40nfdi4plants%2Farctrl?color=%234fb3d9)|
 
-[ISA README.md](src/ISA/README.md) :books:
+## Install
 
-[Contracts README.md](src/Contract/README.md) :books:
+(currently only prereleases available, check the [nuget page](https://www.nuget.org/packages/ARCtrl) or [npm page](https://www.npmjs.com/package/@nfdi4plants/arctrl) respectively)
 
-# Jargon/Nomenclature
+### .NET
 
-In general, a distinction is made between `DataModel`s,  `API`s, and `Tools`:
-- `DataModel`s are the data structures which represent the ARC or it's respective parts in memory. They are serializable and can be used as data exchange format between tool implementations:
-  - `FileSystem`: Represents the file system structure of an ARC. All files and their path relative to the arc root folder are contained here.
-  - `ISA`: Represents the experimental metadata of the ARC that is stored in the ISA-XLSX format (investigation, studies and assays).
-  - `CWL`: Represents the workflow definitions of the ARC in the CWL format.
-- `API`s are static methods on the `DataModel` types that perfrom operations on the `DataModel`s. Often, these are CRUD-like operations, and are aimed to be be composable. 
-  
-  **Example**: A `ARC.addAssay` function has to do several things:
-  - Add a new assay to the `ISA`
-  - Add a new assay to the `FileSystem`
-  it should therefore combine the respective functions of `ISA API` and `FileSystem API` to achieve this.
-
-- `Tools` or `Clients` are user-facing software such as Swate, ARCitect, or the ARCCommander. They should ideally compose their functionality from the `API`s and work with an in-memory representation of the ARC via `DataModel`s. There are operations such as IO for reading/writing actual files to the file system, which are not part of the `API`s, but rather part of the `Tools`.
-
-## Local Setup
-
-1. `dotnet tool restore`
-2. `npm install` in *root* (this will also run `npm install` in `src/ISA`).
-
-## API Design
-
-Command syntax should be inspired by ArcCommander commands, as they are already well established and known to the power user base.
-See syntax : https://nfdi4plants.github.io/arcCommander-docs/docs/01GeneralCLIStructure.html
-See selection: https://nfdi4plants.github.io/arcCommander-docs/docs/02SubcommandVerbs.html
-
-## Top level overview
-
-In the following, the dependency graph of the proposed arcAPI toolstack can be seen:
-
-```mermaid
-flowchart TD
-
-%% ----- Nodes ------
-
-
-subgraph ARCtrl
-    arc[ARC]
-    
-    subgraph ISA
-        isaj[ISA.Json]
-        isax[ISA.Spreadsheet]      
-        isaa[ISA]
-    end
-    subgraph FileSystem
-        fs[FileSystem]
-    end
-    subgraph CWL
-        cwl[CWL]
-    end
-end
-
-subgraph DataTransferObject
-    fsspread[FsSpreadsheet]
-    thoth["Thoth.Json (string)"]
-end
-
-subgraph IO
-    node[node.fs]   
-    fsspreadx[FsSpreadsheet.ExcelIO]   
-    excelJS[exceljs]
-    systemio[System.IO]
-end
-
-
-%% ----- Edges ------
-
-
-%% Arc
-arc --> ISA
-arc --> FileSystem
-arc --> CWL
-
-%% ISA
-isaj --> isaa
-isax --> isaa
-isaj --> thoth
-
-isax --> fsspread
-
-%% ------ Tools ---------
-
-subgraph Tools
-    arcdotnet[/arcIO.NET\]
-    arcitect[[ARCitect]]
-    arccom[[arcCommander]]
-    swate[[Swate]]
-end 
-
-%% ----- Edges ------
-
-Tools --> ARCtrl
-
-arcdotnet --> fsspreadx
-arcdotnet --> systemio
-arcitect --> excelJS
-arcitect --> node
-arccom --> arcdotnet
-
-
-fsspreadx -.-> fsspread
-systemio -.-> thoth
-excelJS -.-> fsspread
-node -.-> thoth
-
-%% ----- Styling ------
-
-%% dotnet
-style Tools stroke:#3A0EC6,stroke-width:2px
-style fsspreadx fill:#8C71E3,stroke:#3A0EC6,stroke-width:2px,color: black
-style arcdotnet fill:#8C71E3,stroke:#3A0EC6,stroke-width:2px,color: black
-style arccom fill:#8C71E3,stroke:#3A0EC6,stroke-width:2px,color: black
-style systemio fill:#8C71E3,stroke:#3A0EC6,stroke-width:2px,color: black
-
-%% javascript
-style excelJS fill:#C1AD09,stroke:#EFD81D,stroke-width:2px,color: black
-style arcitect fill:#C1AD09,stroke:#EFD81D,stroke-width:2px,color: black
-style swate fill:#C1AD09,stroke:#EFD81D,stroke-width:2px,color: black
-style node fill:#C1AD09,stroke:#EFD81D,stroke-width:2px,color: black
-
-
-%% fable
-style ARCtrl stroke:#007B00,stroke-width:2px
-style ISA stroke:#007B00,stroke-width:2px
-style FileSystem stroke:#007B00,stroke-width:2px
-style CWL stroke:#007B00,stroke-width:2px
-style DataTransferObject stroke:#007B00,stroke-width:2px
+```fsharp
+#r "nuget: ARCtrl"
+``` 
 
-style fsspread fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style isax fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style isaa fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style isaj fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style arc fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style fs fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style cwl fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
-style thoth fill:#39B539,stroke:#007B00,stroke-width:2px,color: black
+```bash
+<PackageReference Include="ARCtrl" Version="1.0.0-beta.1" />
 ```
 
-## Stack
-
-```mermaid
-classDiagram 
-
-class arc["ARCtrl"] {
-    ISA
-    CWL
-    FileSystem
-}
-class isa["ISA"] {
-    Investigation
-    Studies
-    Assays
-    ArcTable
-    CompositeColumn
-    CompositeHeader
-    CompositeCell
-}
-class file ["FileSystem"] {
-    - FileSystemTree
-    - History
-}
-class cwl["CWL"] {
-    CommandlineTool?
-    Workflows
-}
-class io["IO"] {
-    FsSpreadsheet.ExcelIO
-    System.IO
-    exceljs
-    node fs
-}
-io <|--|> arc : Contracts
-arc <|--|> isa
-arc <|--|> cwl
-arc <|--|> file
+### JavaScript
 
+```bash
+npm i @nfdi4plants/arctrl
 ```
 
-# Libraries
-
-Mockups for each library are in the `ARC` folder. They contain API/Domain stubs to draft and test the new library designs.
+## Docs
 
-## Design choices
+Currently we provide some documentation in form of markdown files in the `/docs` folder of this repository!
 
-### Fable compatibility as top priority
+[Check it out!](/docs)
 
-All libraries should be Fable compatible, and produce javascript/typescript code that is ergonomic to use in a js/ts environment, therefore:
-- we use classes with static members over nested modules
-- we use the `[<AttachMembers>]` fable attribute for each class
-  - Using overloads with the `[<AttachMembers>]` attribute will make js functions shadow itself. Never use this!
-- we use the `[<NamedParams(n)>]` fable attribute for all optional parameters in static methods that use tupled, named params.
-- we use `Array<'T>` for all collections in F#, since they get transpiled to native js arrays.
-- we use the `[<Erase>]` fable attribute for union cases that contain data 
-    ```fsharp
-     [<Erase>] type X = | Y of string | Z of int
-    ```
-- we use the `[<StringEnum>]` for unions that contain no data (e.g.)
-    ```fsharp
-     [<StringEnum>] type YesOrNo = | Yes | No
-    ```
-    
-**Example:**
-
-```fsharp
-[<AttachMembers>]
-type Study = 
-    {
-        Identifier : string option
-        Assays : Assay array option
-    }
-
-    [<NamedParams>]
-    static member create (?Identifier, ?Assays : Assay array) = 
-        {
-            Identifier = Identifier
-            Assays = Assays
-        }
-```
-
-will become the following javascript code:
-
-```javascript
-export class Study extends Record {
-    constructor(Identifier, Assays) {
-        super();
-        this.Identifier = Identifier;
-        this.Assays = Assays;
-    }
-    static create({ Identifier, Assays }) {
-        return new Study(Identifier, Assays);
-    }
-```
+## Development
 
-and the following typescript code:
+### Requirements
 
-```typescript
-export class Study extends Record implements IEquatable<Study>, IComparable<Study> {
-    readonly Identifier: Option<string>;
-    readonly Assays: Option<Assay[]>;
-    constructor(Identifier: Option<string>, Assays: Option<Assay[]>) {
-        super();
-        this.Identifier = Identifier;
-        this.Assays = Assays;
-    }
-    static create({ Identifier, Assays }: {Identifier?: string, Assays?: Assay[] }): Study {
-        return new Study(Identifier, Assays);
-    }
-```
-
-## Development
+- [nodejs and npm](https://nodejs.org/en/download)
+    - verify with `node --version` (Tested with v18.16.1)
+    - verify with `npm --version` (Tested with v9.2.0)
+- [.NET SDK](https://dotnet.microsoft.com/en-us/download)
+    - verify with `dotnet --version` (Tested with 7.0.306)
 
-### Setup
+### Local Setup
 
 1. `dotnet tool restore`
 2. `dotnet paket install`
 3. `npm install`
 
-Verify correct setup with `./build.cmd runtests` ✨
+Verify correct setup with `./build.cmd runtests` ✨

package/SemVer.js

@@ -1,10 +1,10 @@
-import { match, create } from "./fable_modules/fable-library.4.1.4/RegExp.js";
-import { toString, Record } from "./fable_modules/fable-library.4.1.4/Types.js";
-import { record_type, option_type, string_type, int32_type } from "./fable_modules/fable-library.4.1.4/Reflection.js";
-import { parse } from "./fable_modules/fable-library.4.1.4/Int32.js";
-import { value as value_3, unwrap } from "./fable_modules/fable-library.4.1.4/Option.js";
-import { StringBuilder__Append_Z721C83C5, StringBuilder_$ctor } from "./fable_modules/fable-library.4.1.4/System.Text.js";
-import { printf, toText } from "./fable_modules/fable-library.4.1.4/String.js";
+import { match, create } from "./fable_modules/fable-library.4.4.1/RegExp.js";
+import { toString, Record } from "./fable_modules/fable-library.4.4.1/Types.js";
+import { record_type, option_type, string_type, int32_type } from "./fable_modules/fable-library.4.4.1/Reflection.js";
+import { parse } from "./fable_modules/fable-library.4.4.1/Int32.js";
+import { value as value_3, unwrap } from "./fable_modules/fable-library.4.4.1/Option.js";
+import { StringBuilder__Append_Z721C83C5, StringBuilder_$ctor } from "./fable_modules/fable-library.4.4.1/System.Text.js";
+import { printf, toText } from "./fable_modules/fable-library.4.4.1/String.js";
 
 const SemVerAux_Pattern = "^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<pre>[0-9A-Za-z-\\.]+))?(\\+(?<build>[0-9A-Za-z-\\.]+))?$";
 

package/Templates/Template.Json.js

@@ -1,18 +1,18 @@
-import { toString } from "../fable_modules/fable-library.4.1.4/Types.js";
+import { toString } from "../fable_modules/fable-library.4.4.1/Types.js";
 import { dict, fromString, datetimeUtc, array as array_1, map as map_2, list as list_2, guid as guid_1, object as object_1, string, succeed, andThen } from "../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { uncurry2, uncurry3 } from "../fable_modules/fable-library.4.1.4/Util.js";
+import { uncurry2, uncurry3 } from "../fable_modules/fable-library.4.4.1/Util.js";
 import { Template, Organisation } from "./Template.js";
 import { ConverterOptions_$ctor } from "../ISA/ISA.Json/ConverterOptions.js";
 import { decoder as decoder_2, encoder } from "../ISA/ISA.Json/Person.js";
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../ISA/ISA.Json/Ontology.js";
 import { toString as toString_1, datetime, list as list_1, guid, object } from "../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { ofArray, map } from "../fable_modules/fable-library.4.1.4/List.js";
+import { ofArray, map } from "../fable_modules/fable-library.4.4.1/List.js";
 import { Process_decoder, Process_encoder } from "../ISA/ISA.Json/Process.js";
-import { map as map_1, delay, toList } from "../fable_modules/fable-library.4.1.4/Seq.js";
-import { ArcTables_fromProcesses_134EBDED, ArcTables__get_Item_Z524259A4 } from "../ISA/ISA/ArcTypes/ArcTables.js";
-import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
-import { FSharpMap__get_Values } from "../fable_modules/fable-library.4.1.4/Map.js";
-import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
+import { map as map_1, delay, toList } from "../fable_modules/fable-library.4.4.1/Seq.js";
+import { ArcTables } from "../ISA/ISA/ArcTypes/ArcTables.js";
+import { printf, toFail } from "../fable_modules/fable-library.4.4.1/String.js";
+import { FSharpMap__get_Values } from "../fable_modules/fable-library.4.4.1/Map.js";
+import { defaultArg } from "../fable_modules/fable-library.4.4.1/Option.js";
 
 export const Organisation_encode = toString;
 
@@ -37,7 +37,10 @@ export const Template_decode = (() => {
     const oaDecoder = OntologyAnnotation_decoder(ConverterOptions_$ctor());
     return (path_10) => ((v) => object_1((get$) => {
         let objectArg, arg_3, d, decoder, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, objectArg_9;
-        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => ArcTables__get_Item_Z524259A4(ArcTables_fromProcesses_134EBDED(ps), 0), uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
+        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => {
+            const arctbls = ArcTables.fromProcesses(ps);
+            return arctbls.Tables[0];
+        }, uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
     }, path_10, v));
 })();
 

package/Templates/Template.Spreadsheet.js

@@ -1,25 +1,35 @@
-import { toArray as toArray_1, append as append_1, reverse, map, empty, ofArray } from "../fable_modules/fable-library.4.1.4/List.js";
+import { toString, Record, FSharpException } from "../fable_modules/fable-library.4.4.1/Types.js";
+import { record_type, list_type, string_type, class_type } from "../fable_modules/fable-library.4.4.1/Reflection.js";
+import { toArray as toArray_1, append as append_1, reverse, map, empty, ofArray } from "../fable_modules/fable-library.4.4.1/List.js";
 import { toRows, fromRows, toSparseTable, fromSparseTable } from "../ISA/ISA.Spreadsheet/Metadata/OntologyAnnotation.js";
-import { toString, Record } from "../fable_modules/fable-library.4.1.4/Types.js";
-import { record_type, list_type, string_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Comment$_$reflection } from "../ISA/ISA/JsonTypes/Comment.js";
 import { Comment_fromString } from "../ISA/ISA.Spreadsheet/Metadata/Comment.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "../ISA/ISA.Spreadsheet/Metadata/SparseTable.js";
 import { createMissingIdentifier } from "../ISA/ISA/Identifier.js";
-import { addToDict } from "../fable_modules/fable-library.4.1.4/MapUtil.js";
-import { List_distinct } from "../fable_modules/fable-library.4.1.4/Seq2.js";
-import { getEnumerator, stringHash } from "../fable_modules/fable-library.4.1.4/Util.js";
-import { tryPick, iterateIndexed, delay, singleton, append, head, exists, map as map_1 } from "../fable_modules/fable-library.4.1.4/Seq.js";
+import { addToDict } from "../fable_modules/fable-library.4.4.1/MapUtil.js";
+import { List_distinct } from "../fable_modules/fable-library.4.4.1/Seq2.js";
+import { getEnumerator, stringHash } from "../fable_modules/fable-library.4.4.1/Util.js";
+import { tryPick, iterateIndexed, delay, singleton, append, head, exists, map as map_1 } from "../fable_modules/fable-library.4.4.1/Seq.js";
 import { Person } from "../ISA/ISA/JsonTypes/Person.js";
-import { toArray } from "../fable_modules/fable-library.4.1.4/Option.js";
+import { toArray } from "../fable_modules/fable-library.4.4.1/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "../ISA/ISA.Spreadsheet/Metadata/Contacts.js";
-import { parse } from "../fable_modules/fable-library.4.1.4/Guid.js";
+import { parse } from "../fable_modules/fable-library.4.4.1/Guid.js";
 import { Template, Organisation } from "./Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
-import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.5.0.1/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "../ISA/ISA.Spreadsheet/AnnotationTable/ArcTable.js";
-import { now } from "../fable_modules/fable-library.4.1.4/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { now } from "../fable_modules/fable-library.4.4.1/Date.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.5.0.1/FsWorkbook.fs.js";
+
+export class TemplateReadError extends FSharpException {
+    constructor(Data0) {
+        super();
+        this.Data0 = Data0;
+    }
+}
+
+export function TemplateReadError_$reflection() {
+    return class_type("ARCtrl.Template.Spreadsheet.TemplateReadError", void 0, TemplateReadError, class_type("System.Exception"));
+}
 
 export const Metadata_ER_labels = ofArray(["ER", "ER Term Accession Number", "ER Term Source REF"]);
 
@@ -251,12 +261,12 @@ export function Metadata_Template_toRows(template) {
 }
 
 export function Template_fromParts(templateInfo, ers, tags, authors, table, lastUpdated) {
-    const arg = parse(templateInfo.Id);
-    const arg_4 = Organisation.ofString(templateInfo.Organisation);
-    const arg_6 = toArray_1(authors);
-    const arg_7 = toArray_1(ers);
-    const arg_8 = toArray_1(tags);
-    return Template.make(arg, table, templateInfo.Name, templateInfo.Description, arg_4, templateInfo.Version, arg_6, arg_7, arg_8, lastUpdated);
+    const id = parse(templateInfo.Id);
+    const organisation = Organisation.ofString(templateInfo.Organisation);
+    const authors_1 = toArray_1(authors);
+    const repos = toArray_1(ers);
+    const tags_1 = toArray_1(tags);
+    return Template.make(id, table, templateInfo.Name, templateInfo.Description, organisation, templateInfo.Version, authors_1, repos, tags_1, lastUpdated);
 }
 
 export function Template_toMetadataSheet(template) {
@@ -275,7 +285,7 @@ export function Template_fromMetadataSheet(sheet) {
  * Reads an assay from a spreadsheet
  */
 export function Template_fromFsWorkbook(doc) {
-    let matchValue_2, matchValue_4, ws_3, matchValue_5, arg_1, ws_2, matchValue_3, arg;
+    let matchValue_2, matchValue_4, ws_3, matchValue_5, ws_2, matchValue_3;
     let patternInput;
     const matchValue = doc.TryGetWorksheetByName("isa_template");
     if (matchValue == null) {
@@ -301,15 +311,21 @@ export function Template_fromFsWorkbook(doc) {
         else {
             return void 0;
         }
-    }, sheets), (matchValue_4 == null) ? toFail(printf("No worksheet with name %s found"))(templateInfo.Table) : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? ((arg_1 = ws_3.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg_1))) : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? ((arg = ws_2.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg))) : matchValue_3)))), now());
+    }, sheets), (matchValue_4 == null) ? (() => {
+        throw new TemplateReadError(`No worksheet or table with name \`${templateInfo.Table}\` found`);
+    })() : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_3.Name}\` could not be converted to a table`);
+    })() : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_2.Name}\` could not be converted to a table`);
+    })() : matchValue_3)))), now());
 }
 
 export function Template_toFsWorkbook(template) {
     const doc = new FsWorkbook();
     const metaDataSheet = Template_toMetadataSheet(template);
     doc.AddWorksheet(metaDataSheet);
-    const arg = toFsWorksheet(template.Table);
-    doc.AddWorksheet(arg);
+    const sheet = toFsWorksheet(template.Table);
+    doc.AddWorksheet(sheet);
     return doc;
 }
 

package/Templates/Template.Web.js

@@ -1,9 +1,9 @@
-import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
-import { singleton } from "../fable_modules/fable-library.4.1.4/AsyncBuilder.js";
+import { defaultArg } from "../fable_modules/fable-library.4.4.1/Option.js";
+import { singleton } from "../fable_modules/fable-library.4.4.1/AsyncBuilder.js";
 import { downloadFile } from "../WebRequest/WebRequest.js";
 import { Templates_fromJsonString } from "./Template.Json.js";
-import { startAsPromise } from "../fable_modules/fable-library.4.1.4/Async.js";
-import { class_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
+import { startAsPromise } from "../fable_modules/fable-library.4.4.1/Async.js";
+import { class_type } from "../fable_modules/fable-library.4.4.1/Reflection.js";
 
 export function getTemplates(url) {
     const url_1 = defaultArg(url, "https://github.com/nfdi4plants/Swate-templates/releases/download/latest/templates.json");

package/Templates/Template.js

@@ -1,12 +1,12 @@
-import { identityHash, safeHash, stringHash, equals } from "../fable_modules/fable-library.4.1.4/Util.js";
-import { Union } from "../fable_modules/fable-library.4.1.4/Types.js";
-import { class_type, union_type, string_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
-import { defaultArg, unwrap } from "../fable_modules/fable-library.4.1.4/Option.js";
-import { newGuid } from "../fable_modules/fable-library.4.1.4/Guid.js";
+import { identityHash, safeHash, stringHash, equals } from "../fable_modules/fable-library.4.4.1/Util.js";
+import { Union } from "../fable_modules/fable-library.4.4.1/Types.js";
+import { class_type, union_type, string_type } from "../fable_modules/fable-library.4.4.1/Reflection.js";
+import { defaultArg, unwrap } from "../fable_modules/fable-library.4.4.1/Option.js";
+import { newGuid } from "../fable_modules/fable-library.4.4.1/Guid.js";
 import { ArcTable } from "../ISA/ISA/ArcTypes/ArcTable.js";
 import { SemVer_tryOfString_Z721C83C5 } from "../SemVer.js";
-import { equalsWith } from "../fable_modules/fable-library.4.1.4/Array.js";
-import { toUniversalTime, now, equals as equals_1 } from "../fable_modules/fable-library.4.1.4/Date.js";
+import { equalsWith } from "../fable_modules/fable-library.4.4.1/Array.js";
+import { toUniversalTime, now, equals as equals_1 } from "../fable_modules/fable-library.4.4.1/Date.js";
 
 export class Organisation extends Union {
     constructor(tag, fields) {

package/Templates/Templates.js

@@ -1,8 +1,8 @@
-import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
-import { append, addRangeInPlace, collect, contains as contains_1 } from "../fable_modules/fable-library.4.1.4/Array.js";
-import { uncurry2, safeHash, equals } from "../fable_modules/fable-library.4.1.4/Util.js";
-import { Array_distinct } from "../fable_modules/fable-library.4.1.4/Seq2.js";
-import { class_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
+import { defaultArg } from "../fable_modules/fable-library.4.4.1/Option.js";
+import { append, addRangeInPlace, collect, contains as contains_1 } from "../fable_modules/fable-library.4.4.1/Array.js";
+import { uncurry2, safeHash, equals } from "../fable_modules/fable-library.4.4.1/Util.js";
+import { Array_distinct } from "../fable_modules/fable-library.4.4.1/Seq2.js";
+import { class_type } from "../fable_modules/fable-library.4.4.1/Reflection.js";
 
 export function TemplatesAux_getComparer(matchAll) {
     if (defaultArg(matchAll, false)) {

package/WebRequest/WebRequest.js

@@ -1,9 +1,9 @@
-import { awaitPromise } from "../fable_modules/fable-library.4.1.4/Async.js";
+import { awaitPromise } from "../fable_modules/fable-library.4.4.1/Async.js";
 import { fetch$ } from "../fable_modules/Fable.Fetch.2.6.0/Fetch.fs.js";
-import { empty } from "../fable_modules/fable-library.4.1.4/List.js";
-import { singleton } from "../fable_modules/fable-library.4.1.4/AsyncBuilder.js";
+import { empty } from "../fable_modules/fable-library.4.4.1/List.js";
+import { singleton } from "../fable_modules/fable-library.4.4.1/AsyncBuilder.js";
 import { Http_get } from "../fable_modules/Fable.SimpleHttp.3.5.0/Http.fs.js";
-import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
+import { printf, toFail } from "../fable_modules/fable-library.4.4.1/String.js";
 import "isomorphic-fetch";
 
 export function NodeJs_isNode() {

package/fable_modules/Fable.Fetch.2.6.0/Fetch.fs.js

@@ -1,11 +1,11 @@
-import { Union } from "../fable-library.4.1.4/Types.js";
-import { array_type, tuple_type, bool_type, class_type, union_type, obj_type, int32_type, string_type } from "../fable-library.4.1.4/Reflection.js";
-import { defaultArg } from "../fable-library.4.1.4/Option.js";
-import { empty } from "../fable-library.4.1.4/Seq.js";
-import { keyValueList } from "../fable-library.4.1.4/MapUtil.js";
-import { int32ToString } from "../fable-library.4.1.4/Util.js";
-import { result } from "../Fable.Promise.3.2.0/Promise.fs.js";
-import { singleton } from "../fable-library.4.1.4/List.js";
+import { Union } from "../fable-library.4.4.1/Types.js";
+import { array_type, tuple_type, bool_type, class_type, union_type, obj_type, int32_type, string_type } from "../fable-library.4.4.1/Reflection.js";
+import { defaultArg } from "../fable-library.4.4.1/Option.js";
+import { empty } from "../fable-library.4.4.1/Seq.js";
+import { keyValueList } from "../fable-library.4.4.1/MapUtil.js";
+import { int32ToString } from "../fable-library.4.4.1/Util.js";
+import { result } from "../Fable.Promise.2.2.2/Promise.fs.js";
+import { singleton } from "../fable-library.4.4.1/List.js";
 
 export class Types_HttpRequestHeaders extends Union {
     constructor(tag, fields) {

package/fable_modules/{Fable.Promise.3.2.0 → Fable.Promise.2.2.2}/Fable.Promise.fableproj

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>3.2.0</Version>
-    <PackageVersion>3.2.0</PackageVersion>
+    <Version>2.2.2</Version>
+    <PackageVersion>2.2.2</PackageVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Promise.fs" />
     <Compile Include="PromiseImpl.fs" />
-    <Compile Include="AsyncIterable.fs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="*.fsproj; *.fs" PackagePath="fable\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="3.7.1" />
+    <PackageReference Include="Fable.Core" Version="3.1.5" />
     <PackageReference Update="FSharp.Core" Version="4.7.2" />
   </ItemGroup>
 </Project>