@nfdi4plants/arctrl 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/ts/ts/Spreadsheet/Metadata/Workflow.js

@@ -4,8 +4,8 @@ import { map } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
 import { Option_fromValueWithDefault, ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { ProtocolParameter_fromAggregatedStrings, Component_fromAggregatedStrings, ProtocolParameter_toAggregatedStrings, Component_toAggregatedStrings } from './Conversions.js';
-import { ArcWorkflow_make, ArcWorkflow__get_Identifier, ArcWorkflow__get_WorkflowType, ArcWorkflow__get_Parameters, ArcWorkflow__get_Components, ArcWorkflow__get_SubWorkflowIdentifiers, ArcWorkflow__get_Title, ArcWorkflow__get_Description, ArcWorkflow__get_URI, ArcWorkflow__get_Version, ArcWorkflow__get_Comments } from '../../Core/ArcTypes.js';
 import { createMissingIdentifier, Workflow_tryIdentifierFromFileName, Workflow_fileNameFromIdentifier } from '../../Core/Helper/Identifier.js';
+import { ArcWorkflow } from '../../Core/ArcTypes.js';
 import { Comment_fromString, Comment_toString } from './Comment.js';
 import { SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
 import { join } from '../../../node_modules/@fable-org/fable-library-js/String.js';
@@ -32,7 +32,6 @@ const componentsTypeTermSourceREFLabel = "Components Type Term Source REF";
 const fileNameLabel = "File Name";
 const labels = ofArray([identifierLabel, titleLabel, descriptionLabel, workflowTypeLabel, typeTermAccessionNumberLabel, typeTermSourceREFLabel, subWorkflowIdentifiersLabel, uriLabel, versionLabel, parametersNameLabel, parametersTermAccessionNumberLabel, parametersTermSourceREFLabel, componentsNameLabel, componentsTypeLabel, componentsTypeTermAccessionNumberLabel, componentsTypeTermSourceREFLabel, fileNameLabel]);
 function fromString(identifier, title, description, workflowType, workflowTypeTermAccessionNumber, workflowTypeTermSourceREF, subworkflowIdentifiers, uri, version, parametersName, parametersTermAccessionNumber, parametersTermSourceREF, componentsName, componentsType, componentsTypeTermAccessionNumber, componentsTypeTermSourceREF, fileName, comments) {
-  let matchValue;
   let subworkflowIdentifiers_2;
   if (subworkflowIdentifiers == null) {
     subworkflowIdentifiers_2 = [];
@@ -50,7 +49,18 @@ function fromString(identifier, title, description, workflowType, workflowTypeTe
   let components;
   const collection_2 = Component_fromAggregatedStrings(";", componentsName, componentsType, componentsTypeTermSourceREF, componentsTypeTermAccessionNumber);
   components = Array.from(collection_2);
-  return ArcWorkflow_make(identifier == null ? fileName == null ? createMissingIdentifier() : (matchValue = Workflow_tryIdentifierFromFileName(value(fileName)), matchValue != null ? value(matchValue) : createMissingIdentifier()) : value(identifier), title, description, workflowType_1, uri, version, subworkflowIdentifiers_2, parameters, components, void 0, [], comments);
+  let identifier_4;
+  if (identifier == null) {
+    if (fileName == null) {
+      identifier_4 = createMissingIdentifier();
+    } else {
+      const matchValue = Workflow_tryIdentifierFromFileName(value(fileName));
+      identifier_4 = matchValue != null ? value(matchValue) : createMissingIdentifier();
+    }
+  } else {
+    identifier_4 = value(identifier);
+  }
+  return ArcWorkflow.make(identifier_4, title, description, workflowType_1, uri, version, subworkflowIdentifiers_2, parameters, components, void 0, [], comments);
 }
 function fromSparseTable(matrix) {
   const comments = map$1((k) => Comment_fromString(k, SparseTable__TryGetValueDefault_5BAE6133(matrix, "", [k, 0])), matrix.CommentKeys);
@@ -59,22 +69,22 @@ function fromSparseTable(matrix) {
 function toSparseTable(workflow) {
   const matrix = SparseTable_Create_Z2192E64B(void 0, labels, void 0, 2);
   let commentKeys = empty();
-  const patternInput = ArcWorkflow__get_Identifier(workflow).startsWith("MISSING_IDENTIFIER_") ? ["", ""] : [ArcWorkflow__get_Identifier(workflow), Workflow_fileNameFromIdentifier(ArcWorkflow__get_Identifier(workflow))];
+  const patternInput = workflow.Identifier.startsWith("MISSING_IDENTIFIER_") ? ["", ""] : [workflow.Identifier, Workflow_fileNameFromIdentifier(workflow.Identifier)];
   let wt;
-  const tt = defaultArg(ArcWorkflow__get_WorkflowType(workflow), new OntologyAnnotation());
+  const tt = defaultArg(workflow.WorkflowType, new OntologyAnnotation());
   wt = OntologyAnnotation.toStringObject(tt, true);
-  const pAgg = ProtocolParameter_toAggregatedStrings(";", ofSeq(ArcWorkflow__get_Parameters(workflow)));
-  const cAgg = Component_toAggregatedStrings(";", ofSeq(ArcWorkflow__get_Components(workflow)));
-  const subWorkflowsAgg = join(";", ArcWorkflow__get_SubWorkflowIdentifiers(workflow));
+  const pAgg = ProtocolParameter_toAggregatedStrings(";", ofSeq(workflow.Parameters));
+  const cAgg = Component_toAggregatedStrings(";", ofSeq(workflow.Components));
+  const subWorkflowsAgg = join(";", workflow.SubWorkflowIdentifiers);
   addToDict(matrix.Matrix, [identifierLabel, 1], patternInput[0]);
-  addToDict(matrix.Matrix, [titleLabel, 1], defaultArg(ArcWorkflow__get_Title(workflow), ""));
-  addToDict(matrix.Matrix, [descriptionLabel, 1], defaultArg(ArcWorkflow__get_Description(workflow), ""));
+  addToDict(matrix.Matrix, [titleLabel, 1], defaultArg(workflow.Title, ""));
+  addToDict(matrix.Matrix, [descriptionLabel, 1], defaultArg(workflow.Description, ""));
   addToDict(matrix.Matrix, [workflowTypeLabel, 1], wt.TermName);
   addToDict(matrix.Matrix, [typeTermAccessionNumberLabel, 1], wt.TermAccessionNumber);
   addToDict(matrix.Matrix, [typeTermSourceREFLabel, 1], wt.TermSourceREF);
   addToDict(matrix.Matrix, [subWorkflowIdentifiersLabel, 1], subWorkflowsAgg);
-  addToDict(matrix.Matrix, [uriLabel, 1], defaultArg(ArcWorkflow__get_URI(workflow), ""));
-  addToDict(matrix.Matrix, [versionLabel, 1], defaultArg(ArcWorkflow__get_Version(workflow), ""));
+  addToDict(matrix.Matrix, [uriLabel, 1], defaultArg(workflow.URI, ""));
+  addToDict(matrix.Matrix, [versionLabel, 1], defaultArg(workflow.Version, ""));
   addToDict(matrix.Matrix, [parametersNameLabel, 1], pAgg.TermNameAgg);
   addToDict(matrix.Matrix, [parametersTermAccessionNumberLabel, 1], pAgg.TermAccessionNumberAgg);
   addToDict(matrix.Matrix, [parametersTermSourceREFLabel, 1], pAgg.TermSourceREFAgg);
@@ -88,7 +98,7 @@ function toSparseTable(workflow) {
     const n = patternInput_1[0];
     commentKeys = cons(n, commentKeys);
     addToDict(matrix.Matrix, [n, 1], patternInput_1[1]);
-  }, ArcWorkflow__get_Comments(workflow));
+  }, workflow.Comments);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
     Equals: (x, y) => x === y,
     GetHashCode: stringHash

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@nfdi4plants/arctrl",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "description": "Top level ARC DataModel and API function descriptions.",
   "repository": {
     "type": "git",