npm - @nfdi4plants/arctrl - Versions diffs - 3.2.1 → 3.2.3 - Mend

@nfdi4plants/arctrl 3.2.1 → 3.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/dist/ts/ts/ContractIO/ContractIO.js CHANGED Viewed

@@ -6,10 +6,15 @@ import { curry2 } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { PromiseBuilder__Run_212F1D4B, PromiseBuilder__Delay_62FBFDE1 } from '../fable_modules/Fable.Promise.3.2.0/Promise.fs.js';
 import { promise } from '../fable_modules/Fable.Promise.3.2.0/PromiseImpl.fs.js';
 import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { combine } from '../FileSystem/Path.js';
-import { readFileTextAsync, readFileXlsxAsync, fileExistsAsync, ensureDirectoryOfFileAsync, writeFileTextAsync, writeFileXlsxAsync, renameFileOrDirectoryAsync, deleteFileOrDirectoryAsync } from './FileSystemHelper.js';
+import { combine, split } from '../FileSystem/Path.js';
+import { readFileTextAsync, readFileXlsxAsync, isEmptyFileAsync, fileExistsAsync, ensureDirectoryOfFileAsync, writeFileTextAsync, writeFileXlsxAsync, renameFileOrDirectoryAsync, deleteFileOrDirectoryAsync } from './FileSystemHelper.js';
 import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
-import { fold, append } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { item, fold, append } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F } from '../Spreadsheet/ArcAssay.js';
+import { ArcRun, ArcWorkflow, ArcStudy, ArcAssay } from '../Core/ArcTypes.js';
+import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522 } from '../Spreadsheet/ArcStudy.js';
+import { ARCtrl_ArcWorkflow__ArcWorkflow_toFsWorkbook_Static_Z1C75CB0E } from '../Spreadsheet/ArcWorkflow.js';
+import { ARCtrl_ArcRun__ArcRun_toFsWorkbook_Static_Z3EFAF6F8 } from '../Spreadsheet/ArcRun.js';
 function fulfillReadContractAsync(basePath, c) {
   return catchWith((e_1) => {
@@ -58,6 +63,79 @@ function fulfillReadContractAsync(basePath, c) {
     return Promise.resolve(FSharpResult$2_Error$((arg_2 = _arg_2.message, toText(printf("Error reading contract %s: %s"))(c.Path)(arg_2))));
   }))));
 }
+function tryFulfillEmptyEntityContractAsync(basePath, c) {
+  return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => {
+    const matchValue = c.DTOType;
+    let matchResult = void 0;
+    if (matchValue != null) {
+      switch (value(matchValue)) {
+        case "ISA_Assay":
+        case "ISA_Study":
+        case "ISA_Workflow":
+        case "ISA_Run": {
+          matchResult = 0;
+          break;
+        }
+        default:
+          matchResult = 1;
+      }
+    } else {
+      matchResult = 1;
+    }
+    switch (matchResult) {
+      case 0:
+        return isEmptyFileAsync(combine(basePath, c.Path)).then((_arg) => {
+          if (_arg) {
+            const identifier = item(1, split(c.Path));
+            let wb;
+            const matchValue_1 = c.DTOType;
+            let matchResult_1 = void 0;
+            if (matchValue_1 != null) {
+              switch (value(matchValue_1)) {
+                case "ISA_Assay": {
+                  matchResult_1 = 0;
+                  break;
+                }
+                case "ISA_Study": {
+                  matchResult_1 = 1;
+                  break;
+                }
+                case "ISA_Workflow": {
+                  matchResult_1 = 2;
+                  break;
+                }
+                default:
+                  matchResult_1 = 3;
+              }
+            } else {
+              matchResult_1 = 3;
+            }
+            switch (matchResult_1) {
+              case 0: {
+                wb = ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(new ArcAssay(identifier));
+                break;
+              }
+              case 1: {
+                wb = ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(new ArcStudy(identifier));
+                break;
+              }
+              case 2: {
+                wb = ARCtrl_ArcWorkflow__ArcWorkflow_toFsWorkbook_Static_Z1C75CB0E(new ArcWorkflow(identifier));
+                break;
+              }
+              default:
+                wb = ARCtrl_ArcRun__ArcRun_toFsWorkbook_Static_Z3EFAF6F8(new ArcRun(identifier));
+            }
+            return Promise.resolve(new Contract(c.Operation, c.Path, c.DTOType, wb));
+          } else {
+            return Promise.resolve(void 0);
+          }
+        });
+      default:
+        return Promise.resolve(void 0);
+    }
+  }));
+}
 function fullfillContractBatchAsyncBy(contractF, basePath, cs) {
   return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => startSequential(curry2(contractF)(basePath), cs).then((_arg) => {
     const res = fold((acc, cr) => {
@@ -210,4 +288,4 @@ function fullFillContractBatchAsync(forceOverwrite, basePath, cs) {
   return fullfillContractBatchAsyncBy((basePath_1, c) => fullFillContract(forceOverwrite, basePath_1, c), basePath, cs);
 }
-export { fulfillReadContractAsync, fulfillUpdateContractAsync, fulfillWriteContractAsync, fullFillContract, fullFillContractBatchAsync, fullfillContractBatchAsyncBy, fullfillDeleteContractAsync, fullfillRenameContractAsync };
+export { fulfillReadContractAsync, fulfillUpdateContractAsync, fulfillWriteContractAsync, fullFillContract, fullFillContractBatchAsync, fullfillContractBatchAsyncBy, fullfillDeleteContractAsync, fullfillRenameContractAsync, tryFulfillEmptyEntityContractAsync };

package/dist/ts/ts/ContractIO/FileSystemHelper.d.ts CHANGED Viewed

@@ -21,6 +21,7 @@ export declare function createDirectoryAsync(path: string): Promise<void>;
 export declare function ensureDirectoryAsync(path: string): Promise<void>;
 export declare function ensureDirectoryOfFileAsync(filePath: string): Promise<void>;
 export declare function fileExistsAsync(path: string): Promise<boolean>;
+export declare function isEmptyFileAsync(path: string): Promise<boolean>;
 export declare function readFileTextAsync(path: string): Promise<string>;
 export declare function readFileBinaryAsync(path: string): Promise<MutableArray<uint8>>;
 export declare function readFileXlsxAsync(path: string): Promise<FsWorkbook>;

package/dist/ts/ts/ContractIO/FileSystemHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FileSystemHelper.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/ContractIO/FileSystemHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAa,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAI7D,OAAO,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;~~AAMnF~~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~~CAezF~~;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1F;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYtE"}
1	+ {"version":3,"file":"FileSystemHelper.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/ContractIO/FileSystemHelper.ts"],"names":[],"mappings":"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"}

package/dist/ts/ts/ContractIO/FileSystemHelper.js CHANGED Viewed

@@ -5,6 +5,7 @@ import { trim as trim$1, replace, substring } from '../../node_modules/@fable-or
 import { choose, map } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { isEmpty, empty, map as map$1, concat, append, toArray } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { all } from '../CrossAsync.js';
+import { getFileName } from '../FileSystem/Path.js';
 function FS_stat_Z721C83C5(path) {
   const props = path;
@@ -159,6 +160,9 @@ function fileExistsAsync(path) {
   const pr = PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => FS_stat_Z721C83C5(path).then((_arg) => Promise.resolve(_arg.isFile()))));
   return pr.catch((_arg_1) => false);
 }
+function isEmptyFileAsync(path) {
+  return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => FS_stat_Z721C83C5(path).then((_arg) => Promise.resolve(_arg.size === 0))));
+}
 function readFileTextAsync(path) {
   return FS_readFileText_Z721C83C5(path);
 }
@@ -248,10 +252,13 @@ function getAllFilePathsAsync(directoryPath) {
   return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => {
     const allFiles = (dirs) => PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => isEmpty(dirs) ? Promise.resolve(empty()) : all(map$1(getSubFilesAsync, dirs)).then((_arg) => {
       const subFiles_1 = concat(_arg);
-      return all(map$1(getSubDirectoriesAsync, dirs)).then((_arg_1) => all(map$1(allFiles, _arg_1)).then((_arg_2) => {
-        const subDirContents_1 = concat(_arg_2);
-        return Promise.resolve(append(subDirContents_1, subFiles_1));
-      }));
+      return all(map$1(getSubDirectoriesAsync, dirs)).then((_arg_1) => {
+        const subDirs_1 = map$1((array) => array.filter((d) => getFileName(d) !== ".git"), _arg_1);
+        return all(map$1(allFiles, subDirs_1)).then((_arg_2) => {
+          const subDirContents_1 = concat(_arg_2);
+          return Promise.resolve(append(subDirContents_1, subFiles_1));
+        });
+      });
     })));
     return allFiles([directoryPath_1]).then((_arg_3) => {
       const allFilesRelative = map((arg_2) => standardizeSlashes(makeRelative(directoryPath_1, arg_2)), toArray(_arg_3));
@@ -282,4 +289,4 @@ function deleteFileOrDirectoryAsync(path) {
   }))));
 }
-export { FS_mkdir, FS_readFile, FS_readFileBinary_Z721C83C5, FS_readFileText_Z721C83C5, FS_readdir, FS_rename, FS_rm, FS_stat_Z721C83C5, FS_unlink_Z721C83C5, FS_writeFile, FS_writeFileBinary, FS_writeFileText, PathModule_dirname_Z721C83C5, PathModule_join_Z35CD86D0, createDirectoryAsync, deleteDirectoryAsync, deleteFileAsync, deleteFileOrDirectoryAsync, directoryExistsAsync, ensureDirectoryAsync, ensureDirectoryOfFileAsync, fileExistsAsync, getAllFilePathsAsync, getSubDirectoriesAsync, getSubFilesAsync, makeRelative, moveDirectoryAsync, moveFileAsync, readFileBinaryAsync, readFileTextAsync, readFileXlsxAsync, renameFileOrDirectoryAsync, standardizeSlashes, trim, writeFileBinaryAsync, writeFileTextAsync, writeFileXlsxAsync };
+export { FS_mkdir, FS_readFile, FS_readFileBinary_Z721C83C5, FS_readFileText_Z721C83C5, FS_readdir, FS_rename, FS_rm, FS_stat_Z721C83C5, FS_unlink_Z721C83C5, FS_writeFile, FS_writeFileBinary, FS_writeFileText, PathModule_dirname_Z721C83C5, PathModule_join_Z35CD86D0, createDirectoryAsync, deleteDirectoryAsync, deleteFileAsync, deleteFileOrDirectoryAsync, directoryExistsAsync, ensureDirectoryAsync, ensureDirectoryOfFileAsync, fileExistsAsync, getAllFilePathsAsync, getSubDirectoriesAsync, getSubFilesAsync, isEmptyFileAsync, makeRelative, moveDirectoryAsync, moveFileAsync, readFileBinaryAsync, readFileTextAsync, readFileXlsxAsync, renameFileOrDirectoryAsync, standardizeSlashes, trim, writeFileBinaryAsync, writeFileTextAsync, writeFileXlsxAsync };

package/dist/ts/ts/Conversion/Investigation.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Investigation.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAUjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKzD,OAAO,EAAE,gBAAgB,EAA2C,MAAM,qBAAqB,CAAC;AAMhG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,uBAAuB;;CAGnC;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sDAAsD,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CA6DzJ;AAED,wBAAgB,wDAAwD,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,gBAAgB,~~CAwBtJ~~"}
1	+ {"version":3,"file":"Investigation.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Investigation.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAUjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKzD,OAAO,EAAE,gBAAgB,EAA2C,MAAM,qBAAqB,CAAC;AAMhG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,qBAAa,uBAAuB;;CAGnC;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sDAAsD,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CA6DzJ;AAED,wBAAgB,wDAAwD,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAyBtJ"}

package/dist/ts/ts/Conversion/Investigation.js CHANGED Viewed

@@ -1,9 +1,9 @@
 import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { value, some, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { Exception, equals } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { compose, dateModifiedKey, tryDecompose } from './DateTime.js';
 import { now } from '../../node_modules/@fable-org/fable-library-ts/Date.js';
-import { tryFind, toList, delay, append } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { tryFind, toList, delay, append, exists } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { Comment$ } from '../Core/Comment.js';
 import { Option_fromSeq, ResizeArray_map, ResizeArray_choose, ResizeArray_filter, ResizeArray_append } from '../Core/Helper/Collections.js';
 import { ScholarlyArticleConversion_composeScholarlyArticle_D324A6D, ScholarlyArticleConversion_decomposeScholarlyArticle_Z6839B9E8 } from './ScholarlyArticle.js';
@@ -100,7 +100,8 @@ function InvestigationConversion_decomposeInvestigation_Z6839B9E8(investigation,
   const runs = ResizeArray_map((d_10) => RunConversion_decomposeRun_Z6839B9E8(d_10, unwrap(graph), unwrap(context)), ResizeArray_filter((d_9) => LDDataset.validateARCRun(d_9, unwrap(context)), datasets));
   let comments;
   const c_2 = ResizeArray_map((c_1) => BaseTypes_decomposeComment_Z2F770004(c_1, unwrap(context)), LDDataset.getComments(investigation, unwrap(graph), unwrap(context)));
-  comments = dateModified != null ? ResizeArray_append(c_2, [new Comment$(dateModifiedKey, value(dateModified))]) : c_2;
+  const hasDateModifiedComment = exists((c_3) => equals(c_3.Name, dateModifiedKey), c_2);
+  comments = dateModified != null && !hasDateModifiedComment ? ResizeArray_append(c_2, [new Comment$(dateModifiedKey, value(dateModified))]) : c_2;
   return ArcInvestigation.create(LDDataset.getIdentifierAsString(investigation, unwrap(context)), unwrap(title), unwrap(LDDataset.tryGetDescriptionAsString(investigation, unwrap(context))), unwrap(dateCreated), unwrap(datePublished), void 0, publications, creators, assays, studies, workflows, runs, void 0, comments);
 }

package/dist/ts/ts/Conversion/Process.d.ts CHANGED Viewed

@@ -75,9 +75,11 @@ export declare function ProcessConversion_getProcessGetter(assayName: Option<str
 /**
  * Groups processes by their name, or by the name of the protocol they execute
  *
- * Process names are taken from the Worksheet name and numbered: SheetName_1, SheetName_2, etc.
+ * Process names are taken from the Worksheet name and numbered from 0: SheetName_0, SheetName_1, etc. Every row has a suffix.
  *
- * This function decomposes this name into a root name and a number, and groups processes by root name.
+ * This function decomposes the name into a root name and a number, and groups processes by root name.
+ * A name without a number that fits in an Int32 is the group key as it is, if it is not blank.
+ * Otherwise the key is the protocol name, then a blank name, then the protocol @id, then a new missing identifier.
  */
 export declare function ProcessConversion_groupProcesses_Z27F0B586(processes: FSharpList<LDNode>, graph?: LDGraph, context?: LDContext): FSharpList<[string, FSharpList<LDNode>]>;
 /**

package/dist/ts/ts/Conversion/Process.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Process.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Process.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EAAgC,MAAM,EAAU,MAAM,uCAAuC,CAAC;AACrG,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,~~EAAS~~,KAAK,EAAE,MAAM,sCAAsC,CAAC;~~AAIpE~~,OAAO,EAA8C,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAClH,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAA4D,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AACpI,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;~~AAKzD~~,OAAO,EAA+C,UAAU,EAAE,MAAM,qCAAqC,CAAC;~~AAQ9G~~;;GAEG;AACH,qBAAa,iBAAiB;;CAG7B;AAED,wBAAgB,6BAA6B,IAAI,QAAQ,CAExD;AAED,wBAAgB,8CAA8C,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAe3I;AAED,wBAAgB,oCAAoC,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAE9F;AAED,wBAAgB,gDAAgD,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,~~CAStG~~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~~;;;;;;GAMG~~;AACH,wBAAgB,0CAA0C,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,~~CAuDxK~~;AAED;;GAEG;AACH,wBAAgB,yCAAyC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAiFvK"}
1	+ {"version":3,"file":"Process.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Process.ts"],"names":[],"mappings":"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"}

package/dist/ts/ts/Conversion/Process.js CHANGED Viewed

@@ -3,13 +3,14 @@ import { LDLabProtocol } from '../ROCrate/LDTypes/LabProtocol.js';
 import { unwrap, value, defaultArg } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
 import { BaseTypes_decomposeDefinedTerm_Z2F770004, BaseTypes_composeComponent, BaseTypes_composeParameterValue, BaseTypes_composeFactorValue, BaseTypes_composeCharacteristicValue, BaseTypes_composeDefinedTerm_ZDED3A0F, BaseTypes_composeProcessInput, BaseTypes_composeProcessOutput, BaseTypes_decomposeParameterValue_Z2F770004, BaseTypes_decomposeComponent_Z2F770004, BaseTypes_decomposeCharacteristicValue_Z2F770004, BaseTypes_decomposeFactorValue_Z2F770004, BaseTypes_decomposeProcessInput_Z2F770004, BaseTypes_decomposeProcessOutput_Z2F770004 } from './Basic.js';
-import { parse } from '../../node_modules/@fable-org/fable-library-ts/Int32.js';
-import { ActivePatterns_$007CRegex$007C_$007C } from '../Core/Helper/Regex.js';
+import { tryParse } from '../../node_modules/@fable-org/fable-library-ts/Int32.js';
+import { match, create } from '../../node_modules/@fable-org/fable-library-ts/RegExp.js';
+import { Pattern_handleGroupPatterns } from '../Core/Helper/Regex.js';
+import { FSharpRef, toString } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
 import { Unchecked_tryGetCellAt, getEmptyCellForHeader } from '../Core/Table/ArcTableAux.js';
 import { ARCtrl_ROCrate_LDNode__LDNode_SetColumnIndex_Z524259A4, tryGetIndex } from './ColumnIndex.js';
 import { CompositeCell_FreeText, CompositeCell_Term } from '../Core/Table/CompositeCell.js';
 import { CompositeHeader, CompositeHeader_Comment$ } from '../Core/Table/CompositeHeader.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
 import { Comment$ } from '../Core/Comment.js';
 import { LDPerson } from '../ROCrate/LDTypes/Person.js';
 import { indexed, toList, filter, tryPick, choose as choose$1, map, delay, append, empty as empty$1, singleton } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
@@ -19,6 +20,7 @@ import { LDSample } from '../ROCrate/LDTypes/Sample.js';
 import { LDLabProcess } from '../ROCrate/LDTypes/LabProcess.js';
 import { List_groupBy } from '../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
+import { isNullOrWhiteSpace } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 import { stringHash, comparePrimitives } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 class ProcessConversion {
@@ -46,10 +48,19 @@ function ProcessConversion_composeProcessName(processNameRoot, i) {
   return `${processNameRoot}_${i}`;
 }
 function ProcessConversion_decomposeProcessName_Z721C83C5(name) {
-  const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("(?<name>.+)_(?<num>\\d+)", name);
-  if (activePatternResult != null) {
-    const r = value(activePatternResult);
-    return [r.groups && r.groups.name || "", parse(r.groups && r.groups.num || "", 511, false, 32)];
+  const m = match(create(Pattern_handleGroupPatterns("^(?<name>.*)_(?<num>\\d+)$")), name);
+  if (m != null) {
+    const nameGroup = m.groups && m.groups.name || "";
+    let matchValue;
+    let outArg = 0;
+    matchValue = [tryParse(m.groups && m.groups.num || "", 511, false, 32, new FSharpRef(() => outArg | 0, (v) => {
+      outArg = v | 0;
+    })), outArg];
+    if (matchValue[0]) {
+      return [nameGroup, matchValue[1]];
+    } else {
+      return [name, void 0];
+    }
   } else {
     return [name, void 0];
   }
@@ -311,7 +322,7 @@ function ProcessConversion_getProcessGetter(assayName, studyName, processNameRoo
   }
   return (table_6) => (i_6) => {
     let collection_4 = void 0, collection_5 = void 0, collection_6 = void 0, option_9 = void 0, option_11 = void 0, option_13 = void 0, option_15 = void 0;
-    const pn = table_6.RowCount === 1 ? processNameRoot : ProcessConversion_composeProcessName(processNameRoot, i_6);
+    const pn = ProcessConversion_composeProcessName(processNameRoot, i_6);
     let paramvalues;
     const option_1 = Option_fromValueWithDefault(empty(), map$1((f_4) => f_4(table_6)(i_6), parameterValueGetters));
     paramvalues = option_1 != null ? (collection_4 = value(option_1), Array.from(collection_4)) : void 0;
@@ -341,42 +352,47 @@ function ProcessConversion_groupProcesses_Z27F0B586(processes, graph, context) {
     let protocol = void 0, protocol_1 = void 0;
     const matchValue = LDLabProcess.tryGetNameAsString(p, unwrap(context));
     const matchValue_1 = LDLabProcess.tryGetExecutesLabProtocol(p, unwrap(graph), unwrap(context));
-    let matchResult = void 0, name_1 = void 0, protocol_2 = void 0, name_2 = void 0, protocol_3 = void 0;
+    let matchResult = void 0, name_2 = void 0, name_3 = void 0, protocol_2 = void 0, name_4 = void 0, protocol_3 = void 0;
     if (matchValue != null) {
       if (ProcessConversion_decomposeProcessName_Z721C83C5(value(matchValue))[1] != null) {
         matchResult = 0;
-        name_1 = value(matchValue);
+        name_2 = value(matchValue);
+      } else if (!isNullOrWhiteSpace(value(matchValue))) {
+        matchResult = 1;
+        name_3 = value(matchValue);
       } else if (matchValue_1 != null) {
         if (protocol = value(matchValue_1), LDLabProtocol.tryGetNameAsString(protocol, unwrap(context)) != null) {
-          matchResult = 1;
+          matchResult = 2;
           protocol_2 = value(matchValue_1);
         } else {
-          matchResult = 2;
-          name_2 = value(matchValue);
+          matchResult = 3;
+          name_4 = value(matchValue);
         }
       } else {
-        matchResult = 2;
-        name_2 = value(matchValue);
+        matchResult = 3;
+        name_4 = value(matchValue);
       }
     } else if (matchValue_1 != null) {
       if (protocol_1 = value(matchValue_1), LDLabProtocol.tryGetNameAsString(protocol_1, unwrap(context)) != null) {
-        matchResult = 1;
+        matchResult = 2;
         protocol_2 = value(matchValue_1);
       } else {
-        matchResult = 3;
+        matchResult = 4;
         protocol_3 = value(matchValue_1);
       }
     } else {
-      matchResult = 4;
+      matchResult = 5;
     }
     switch (matchResult) {
       case 0:
-        return ProcessConversion_decomposeProcessName_Z721C83C5(name_1)[0];
+        return ProcessConversion_decomposeProcessName_Z721C83C5(name_2)[0];
       case 1:
-        return defaultArg(LDLabProtocol.tryGetNameAsString(protocol_2, unwrap(context)), "");
+        return name_3;
       case 2:
-        return name_2;
+        return defaultArg(LDLabProtocol.tryGetNameAsString(protocol_2, unwrap(context)), "");
       case 3:
+        return name_4;
+      case 4:
         return protocol_3.Id;
       default:
         return createMissingIdentifier();

package/dist/ts/ts/Conversion/Table.d.ts CHANGED Viewed

@@ -36,9 +36,10 @@ export declare function ARCtrl_ArcTables__ArcTables_GetProcesses_5E660E5C(this$:
 /**
  * Create a collection of tables from a list of processes.
  *
- * For this, the processes are grouped by nameroot ("nameroot_1", "nameroot_2" ...) or exectued protocol if no name exists
+ * For this, the processes are grouped by nameroot ("nameroot_0", "nameroot_1" ...).
+ * A process name without a number that fits in an Int32 is the group key as it is. Processes without a usable name fall back to their protocol. ProcessConversion.groupProcesses has the full order.
  *
- * Then each group is converted to a table with this nameroot as sheetname
+ * Then each group is converted to a table with this group key as sheetname
  */
 export declare function ARCtrl_ArcTables__ArcTables_fromProcesses_Static_Z27F0B586(ps: FSharpList<LDNode>, graph?: LDGraph, context?: LDContext): ArcTables;
 //# sourceMappingURL=Table.d.ts.map

package/dist/ts/ts/Conversion/Table.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Table.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAiB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAgC,UAAU,EAAyB,MAAM,qCAAqC,CAAC;AAItH,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC,GAAG,MAAM,CAkGhI;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAqBjI;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAyB1F;AAED;;GAEG;AACH,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAQ5J;AAED;;;;;;GAMG;AACH,wBAAgB,wDAAwD,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAG7J;AAED;;GAEG;AACH,wBAAgB,iDAAiD,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAE/J;AAED~~;;;;;;GAMG~~;AACH,wBAAgB,0DAA0D,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAMlJ"}
1	+ {"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Table.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAiB,MAAM,gCAAgC,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAgC,UAAU,EAAyB,MAAM,qCAAqC,CAAC;AAItH,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC,GAAG,MAAM,CAkGhI;AAED;;;;GAIG;AACH,wBAAgB,uDAAuD,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAqBjI;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAyB1F;AAED;;GAEG;AACH,wBAAgB,+CAA+C,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAQ5J;AAED;;;;;;GAMG;AACH,wBAAgB,wDAAwD,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAG7J;AAED;;GAEG;AACH,wBAAgB,iDAAiD,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAE/J;AAED;;;;;;;GAOG;AACH,wBAAgB,0DAA0D,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAMlJ"}

package/dist/ts/ts/Conversion/Table.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { unwrap, some, value } from '../../node_modules/@fable-org/fable-library
 import { ArcTable } from '../Core/Table/ArcTable.js';
 import { getEnumerator, disposeSafe, safeHash, equals } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { ARCtrl_ROCrate_LDNode__LDNode_TryGetColumnIndex } from './ColumnIndex.js';
-import { ProcessConversion_tryGetProtocolType_Z6839B9E8, ProcessConversion_getProcessGetter, ProcessConversion_processToRows_Z6839B9E8, ProcessConversion_groupProcesses_Z27F0B586 } from './Process.js';
+import { ProcessConversion_tryGetProtocolType_Z6839B9E8, ProcessConversion_composeProcessName, ProcessConversion_getProcessGetter, ProcessConversion_processToRows_Z6839B9E8, ProcessConversion_groupProcesses_Z27F0B586 } from './Process.js';
 import { LDPropertyValue } from '../ROCrate/LDTypes/PropertyValue.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
 import { singleton, initialize, collect, ofSeq, map as map$1 } from '../../node_modules/@fable-org/fable-library-ts/List.js';
@@ -172,10 +172,10 @@ function ARCtrl_ArcTable__ArcTable_GetProtocols(this$) {
 }
 function ARCtrl_ArcTable__ArcTable_GetProcesses_5E660E5C(this$, assayName, studyName, fs) {
   if (this$.RowCount === 0) {
-    return singleton(LDLabProcess.create(this$.Name));
+    return singleton(LDLabProcess.create(ProcessConversion_composeProcessName(this$.Name, 0)));
   } else {
     const getter = ProcessConversion_getProcessGetter(assayName, studyName, this$.Name, this$.Headers, fs);
-    return toList(delay(() => map((i) => getter(this$)(i), rangeDouble(0, 1, this$.RowCount - 1))));
+    return toList(delay(() => map((i_1) => getter(this$)(i_1), rangeDouble(0, 1, this$.RowCount - 1))));
   }
 }
 function ARCtrl_ArcTable__ArcTable_fromProcesses_Static_Z3575FB5F(name, ps, graph, context) {

package/dist/ts/ts/Core/Conversion.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Conversion.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Conversion.ts"],"names":[],"mappings":"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~~CA+E~~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"}
1	+ {"version":3,"file":"Conversion.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Conversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,MAAM,EAAiC,MAAM,uCAAuC,CAAC;AAE5G,OAAO,EAAW,KAAK,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAuD,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG3G,OAAO,EAAqF,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACnJ,OAAO,EAAE,SAAS,EAA4B,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAiO,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACnS,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAA+B,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAA0C,MAAM,qCAAqC,CAAC;AACrH,OAAO,EAAE,iBAAiB,EAAoC,MAAM,gCAAgC,CAAC;AACrG,OAAO,EAAoO,mBAAmB,EAAwJ,MAAM,2BAA2B,CAAC;AACxb,OAAO,EAAoM,oBAAoB,EAAsH,MAAM,4BAA4B,CAAC;AAQxX,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAoL,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACnP,OAAO,EAA6D,OAAO,EAAqC,MAAM,sBAAsB,CAAC;AAC7I,OAAO,EAAqM,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKpP,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,eAAO,MAAM,4BAA4B,6BAA6B,CAAC;AAEvE,eAAO,MAAM,+BAA+B,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAGnE,CAAC;AAEL,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAK5F;AAED;;GAEG;AACH,wBAAgB,4CAA4C,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAU7F;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAS3E;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAqBlE;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAWjE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC,CA8B3H;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,SAAS,CAGjH;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,qBAAqB,CAIlI;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,WAAW,CAGrH;AAED;;GAEG;AACH,wBAAgB,oCAAoC,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,sBAAsB,CAGxI;AAED,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5F;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,mBAAmB,CAoB9H;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,oBAAoB,GAAG,oBAAoB,CAoChI;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,GAAG,oBAAoB,CAyF/H;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAEzG;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,qBAAqB,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAE5H;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,WAAW,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAE9G;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,EAAE,EAAE,sBAAsB,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAEjI;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,mBAAmB,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAqBvH;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,EAAE,EAAE,oBAAoB,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAmBzH;AAED;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CAAC,EAAE,EAAE,kBAAkB,GAAG,MAAM,CAQlF;AAED;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAatF;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAcjL;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAW7L;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,CAWhL;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,sBAAsB,CAAC,CAAC,CAAC,CAWnM;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAgB5K;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAgB/J;AAED;;GAEG;AACH,wBAAgB,8CAA8C,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAgBvK;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAgB/J;AAED;;GAEG;AACH,wBAAgB,0CAA0C,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAgBnK;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAWtK;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAWxK;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAiB7J;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CA6GpK;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAqBhH;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAwB1G;AAED,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC,CAAC,CA+D/H;AAED,wBAAgB,oDAAoD,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAQ7H;AAED,wBAAgB,iDAAiD,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,CAQ/G;AAED,wBAAgB,yDAAyD,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAOlI;AAED,wBAAgB,oDAAoD,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,CAAC,SAAS,CAAC,CAOrH;AAED;;GAEG;AACH,wBAAgB,8DAA8D,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,oBAAoB,CAEzJ;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC,GAAG,QAAQ,CAuGlI;AAED;;;;GAIG;AACH,wBAAgB,sDAAsD,CAAC,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAgC5F;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAqC5F;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,CAa3F;AAED;;;;;;GAMG;AACH,wBAAgB,8CAA8C,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAG9G;AAED;;GAEG;AACH,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,CAE9F;AAED;;;;;;GAMG;AACH,wBAAgB,yDAAyD,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,SAAS,CAM5G"}

package/dist/ts/ts/Core/Conversion.js CHANGED Viewed

@@ -213,25 +213,26 @@ function JsonTypes_composeProcessOutput(header, value) {
   }
 }
 function JsonTypes_cellOfValue(value$1, unit) {
+  let u = void 0;
   const value_2 = defaultArg(value$1, ScalarValue_Name(""));
-  let matchResult = void 0, oa = void 0, text = void 0, name = void 0, u = void 0, f = void 0, u_1 = void 0, f_1 = void 0, i = void 0, u_2 = void 0, i_1 = void 0;
+  let matchResult = void 0, oa_1 = void 0, oa_2 = void 0, u_1 = void 0, text = void 0, name = void 0, u_2 = void 0, f = void 0, u_3 = void 0, f_1 = void 0, i = void 0, u_4 = void 0, i_1 = void 0;
   switch (value_2.tag) {
     case /* Name */
     3: {
       if (value_2.fields[0] === "") {
         if (unit != null) {
-          matchResult = 3;
+          matchResult = 4;
           name = value_2.fields[0];
-          u = value(unit);
+          u_2 = value(unit);
         } else {
-          matchResult = 1;
+          matchResult = 2;
         }
       } else if (unit != null) {
-        matchResult = 3;
+        matchResult = 4;
         name = value_2.fields[0];
-        u = value(unit);
+        u_2 = value(unit);
       } else {
-        matchResult = 2;
+        matchResult = 3;
         text = value_2.fields[0];
       }
       break;
@@ -239,51 +240,59 @@ function JsonTypes_cellOfValue(value$1, unit) {
     case /* Float */
     2: {
       if (unit == null) {
-        matchResult = 5;
+        matchResult = 6;
         f_1 = value_2.fields[0];
       } else {
-        matchResult = 4;
+        matchResult = 5;
         f = value_2.fields[0];
-        u_1 = value(unit);
+        u_3 = value(unit);
       }
       break;
     }
     case /* Int */
     1: {
       if (unit == null) {
-        matchResult = 7;
+        matchResult = 8;
         i_1 = value_2.fields[0];
       } else {
-        matchResult = 6;
+        matchResult = 7;
         i = value_2.fields[0];
-        u_2 = value(unit);
+        u_4 = value(unit);
       }
       break;
     }
     default:
-      if (unit == null) {
-        matchResult = 0;
-        oa = value_2.fields[0];
+      if (unit != null) {
+        if (u = value(unit), value_2.fields[0], u.isEmpty()) {
+          matchResult = 1;
+          oa_2 = value_2.fields[0];
+          u_1 = value(unit);
+        } else {
+          matchResult = 9;
+        }
       } else {
-        matchResult = 8;
+        matchResult = 0;
+        oa_1 = value_2.fields[0];
       }
   }
   switch (matchResult) {
     case 0:
-      return CompositeCell_Term(oa);
+      return CompositeCell_Term(oa_1);
     case 1:
-      return CompositeCell_Term(new OntologyAnnotation());
+      return CompositeCell_Term(oa_2);
     case 2:
-      return CompositeCell_Term(new OntologyAnnotation(text));
+      return CompositeCell_Term(new OntologyAnnotation());
     case 3:
-      return CompositeCell_Unitized(name, u);
+      return CompositeCell_Term(new OntologyAnnotation(text));
     case 4:
-      return CompositeCell_Unitized(f.toString(), u_1);
+      return CompositeCell_Unitized(name, u_2);
     case 5:
-      return CompositeCell_Unitized(f_1.toString(), new OntologyAnnotation());
+      return CompositeCell_Unitized(f.toString(), u_3);
     case 6:
-      return CompositeCell_Unitized(int32ToString(i), u_2);
+      return CompositeCell_Unitized(f_1.toString(), new OntologyAnnotation());
     case 7:
+      return CompositeCell_Unitized(int32ToString(i), u_4);
+    case 8:
       return CompositeCell_Unitized(int32ToString(i_1), new OntologyAnnotation());
     default:
       return toFail(printf("Could not parse value %O with unit %O"))(value_2)(unit);

package/dist/ts/ts/Core/Data.d.ts CHANGED Viewed

@@ -35,9 +35,15 @@ export declare class Data implements IISAPrintable {
     static create(Id?: string, Name?: string, DataType?: DataFile_$union, Format?: string, SelectorFormat?: string, Comments?: Comment$[]): Data;
     static get empty(): Data;
     get NameText(): string;
+    /**
+     * Returns true if the data contains no information. A file path consisting only of whitespace counts as empty.
+     */
+    isEmpty(): boolean;
     GetAbsolutePathBy(f: ((arg0: string) => string), checkExistenceFromRoot?: ((arg0: string) => boolean)): string;
     GetAbsolutePathForAssay(assayIdentifier: string, checkExistenceFromRoot?: ((arg0: string) => boolean)): string;
     GetAbsolutePathForStudy(studyIdentifier: string, checkExistenceFromRoot?: ((arg0: string) => boolean)): string;
+    GetAbsolutePathForWorkflow(workflowIdentifier: string, checkExistenceFromRoot?: ((arg0: string) => boolean)): string;
+    GetAbsolutePathForRun(runIdentifier: string, checkExistenceFromRoot?: ((arg0: string) => boolean)): string;
     Copy(): Data;
     GetHashCode(): int32;
     Equals(obj: any): boolean;

package/dist/ts/ts/Core/Data.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Data.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Data.ts"],"names":[],"mappings":"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"}