@nfdi4plants/arctrl 3.2.3 → 3.3.1

package/dist/ts/ts/Contract/ArcRun.js

@@ -1,15 +1,15 @@
 import { equalsWith, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { combineMany, getRunFolderPath } from '../FileSystem/Path.js';
 import { defaultOf } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { defaultArg, value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { Run_fileNameFromIdentifier, Run_cwlFileNameFromIdentifier, Run_ymlFileNameFromIdentifier } from '../Core/Helper/Identifier.js';
+import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Run_cwlFileNameFromIdentifier, Run_ymlFileNameFromIdentifier, Run_fileNameFromIdentifier } from '../Core/Helper/Identifier.js';
+import { encodeProcessingUnit, encodeYAMLParameterFile } from '../CWL/Encode.js';
 import { Contract } from './Contract.js';
 import { ARCtrl_ArcRun__ArcRun_toFsWorkbook_Static_Z3EFAF6F8, ARCtrl_ArcRun__ArcRun_fromFsWorkbook_Static_32154C9D } from '../Spreadsheet/ArcRun.js';
 import { toArray, delay, append, collect, singleton, empty } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { FileSystemTree } from '../FileSystem/FileSystemTree.js';
-import { encodeProcessingUnit } from '../CWL/Encode.js';
 import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
-import { Decode_decodeCWLProcessingUnit, DecodeParameters_decodeYAMLParameterFile } from '../CWL/Decode.js';
+import { CWLFileReading_decodeCWLFile, CWLFileReading_decodeParameterFile } from './ArcWorkflow.js';
 
 function $007CRunPath$007C_$007C(input) {
   let matchResult = void 0;
@@ -83,6 +83,30 @@ function $007CRunYMLPath$007C_$007C(input) {
       return void 0;
   }
 }
+function ARCtrl_ArcRun__ArcRun_TryToCWLContract_Z2D283928(this$, operation) {
+  let description = void 0, path = void 0, dto = void 0;
+  const option_1 = this$.CWLDescription;
+  if (option_1 != null) {
+    return description = option_1, path = Run_cwlFileNameFromIdentifier(this$.Identifier), dto = encodeProcessingUnit(description), Contract.create(operation, path, {
+      dtoType: "CWL",
+      dto
+    });
+  } else {
+    return void 0;
+  }
+}
+function ARCtrl_ArcRun__ArcRun_TryToYMLContract_Z2D283928(this$, operation) {
+  if (this$.CWLInput.length === 0) {
+    return void 0;
+  } else {
+    const path = Run_ymlFileNameFromIdentifier(this$.Identifier);
+    const dto = encodeYAMLParameterFile(this$.CWLInput);
+    return Contract.create(operation, path, {
+      dtoType: "YAML",
+      dto
+    });
+  }
+}
 function ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49(this$, WithFolder) {
   const withFolder = defaultArg(WithFolder, false);
   const path = Run_fileNameFromIdentifier(this$.Identifier);
@@ -90,8 +114,11 @@ function ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49(this$, WithFolder) {
   return toArray(delay(() => {
     let folderFS = void 0;
     return append(withFolder ? (folderFS = FileSystemTree.createRunsFolder([FileSystemTree.createRunFolder(this$.Identifier)]), collect((p) => p !== path && p !== "runs/.gitkeep" ? singleton(Contract.createCreate(p, "PlainText")) : empty(), folderFS.ToFilePaths(false))) : empty(), delay(() => {
-      let path_1 = void 0, dto = void 0;
-      return append(this$.CWLDescription != null ? (path_1 = Run_cwlFileNameFromIdentifier(this$.Identifier), dto = encodeProcessingUnit(value(this$.CWLDescription)), singleton(Contract.createCreate(path_1, "CWL", dto))) : empty(), delay(() => singleton(c)));
+      let matchValue = void 0;
+      return append((matchValue = ARCtrl_ArcRun__ArcRun_TryToCWLContract_Z2D283928(this$, "CREATE"), matchValue == null ? empty() : singleton(matchValue)), delay(() => {
+        let matchValue_1 = void 0;
+        return append((matchValue_1 = ARCtrl_ArcRun__ArcRun_TryToYMLContract_Z2D283928(this$, "CREATE"), matchValue_1 == null ? empty() : singleton(matchValue_1)), delay(() => singleton(c)));
+      }));
     }));
   }));
 }
@@ -116,11 +143,11 @@ function ARCtrl_ArcRun__ArcRun_tryFromReadContract_Static_7570923F(c) {
   let matchResult = void 0, fsworkbook = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Run") {
+      if (c.DTOType === "ISA_Run") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
+          if (c.DTO instanceof FsWorkbook) {
             matchResult = 0;
-            fsworkbook = value(c.DTO);
+            fsworkbook = c.DTO;
           } else {
             matchResult = 1;
           }
@@ -148,12 +175,12 @@ function ARCtrl_ArcRun__ArcRun_tryCWLFromReadContract_Static(runIdentifier, c) {
   let matchResult = void 0, text_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "CWL") {
+      if (c.DTOType === "CWL") {
         if (c.DTO != null) {
-          if (typeof value(c.DTO) === "string") {
-            if (value(c.DTO), c.Path === p) {
+          if (typeof c.DTO === "string") {
+            if (c.DTO, c.Path === p) {
               matchResult = 0;
-              text_1 = value(c.DTO);
+              text_1 = c.DTO;
             } else {
               matchResult = 1;
             }
@@ -174,7 +201,7 @@ function ARCtrl_ArcRun__ArcRun_tryCWLFromReadContract_Static(runIdentifier, c) {
   }
   switch (matchResult) {
     case 0:
-      return Decode_decodeCWLProcessingUnit(text_1);
+      return CWLFileReading_decodeCWLFile(c.Path, text_1);
     default:
       return void 0;
   }
@@ -184,12 +211,12 @@ function ARCtrl_ArcRun__ArcRun_tryYMLFromReadContract_Static(runIdentifier, c) {
   let matchResult = void 0, text_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "YAML") {
+      if (c.DTOType === "YAML") {
         if (c.DTO != null) {
-          if (typeof value(c.DTO) === "string") {
-            if (value(c.DTO), c.Path === p) {
+          if (typeof c.DTO === "string") {
+            if (c.DTO, c.Path === p) {
               matchResult = 0;
-              text_1 = value(c.DTO);
+              text_1 = c.DTO;
             } else {
               matchResult = 1;
             }
@@ -210,10 +237,10 @@ function ARCtrl_ArcRun__ArcRun_tryYMLFromReadContract_Static(runIdentifier, c) {
   }
   switch (matchResult) {
     case 0:
-      return DecodeParameters_decodeYAMLParameterFile(text_1);
+      return CWLFileReading_decodeParameterFile(c.Path, text_1);
     default:
       return void 0;
   }
 }
 
-export { $007CRunCWLPath$007C_$007C, $007CRunPath$007C_$007C, $007CRunYMLPath$007C_$007C, ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49, ARCtrl_ArcRun__ArcRun_ToDeleteContract, ARCtrl_ArcRun__ArcRun_ToUpdateContract, ARCtrl_ArcRun__ArcRun_toCreateContract_Static_Z71974BBF, ARCtrl_ArcRun__ArcRun_toDeleteContract_Static_Z3EFAF6F8, ARCtrl_ArcRun__ArcRun_toUpdateContract_Static_Z3EFAF6F8, ARCtrl_ArcRun__ArcRun_tryCWLFromReadContract_Static, ARCtrl_ArcRun__ArcRun_tryFromReadContract_Static_7570923F, ARCtrl_ArcRun__ArcRun_tryYMLFromReadContract_Static };
+export { $007CRunCWLPath$007C_$007C, $007CRunPath$007C_$007C, $007CRunYMLPath$007C_$007C, ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49, ARCtrl_ArcRun__ArcRun_ToDeleteContract, ARCtrl_ArcRun__ArcRun_ToUpdateContract, ARCtrl_ArcRun__ArcRun_TryToCWLContract_Z2D283928, ARCtrl_ArcRun__ArcRun_TryToYMLContract_Z2D283928, ARCtrl_ArcRun__ArcRun_toCreateContract_Static_Z71974BBF, ARCtrl_ArcRun__ArcRun_toDeleteContract_Static_Z3EFAF6F8, ARCtrl_ArcRun__ArcRun_toUpdateContract_Static_Z3EFAF6F8, ARCtrl_ArcRun__ArcRun_tryCWLFromReadContract_Static, ARCtrl_ArcRun__ArcRun_tryFromReadContract_Static_7570923F, ARCtrl_ArcRun__ArcRun_tryYMLFromReadContract_Static };

package/dist/ts/ts/Contract/ArcStudy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArcStudy.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ArcStudy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAA6B,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE1F,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0BrF;AAED,wBAAgB,mDAAmD,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAQjI;AAED,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAGpF;AAED,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAGpF;AAED,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAEpG;AAED,wBAAgB,2DAA2D,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAEzI;AAED,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAEpG;AAED,wBAAgB,6DAA6D,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAmCnI"}
+{"version":3,"file":"ArcStudy.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ArcStudy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAsB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEnF,OAAO,EAAgB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIvD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0BrF;AAED,wBAAgB,mDAAmD,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAQjI;AAED,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAGpF;AAED,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAGpF;AAED,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAEpG;AAED,wBAAgB,2DAA2D,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAEzI;AAED,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAEpG;AAED,wBAAgB,6DAA6D,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAmCnI"}

package/dist/ts/ts/Contract/ArcStudy.js

@@ -1,7 +1,7 @@
 import { equalsWith, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { combineMany, getStudyFolderPath } from '../FileSystem/Path.js';
 import { defaultOf } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { defaultArg, unwrap, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Study_fileNameFromIdentifier } from '../Core/Helper/Identifier.js';
 import { Contract } from './Contract.js';
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522, ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D } from '../Spreadsheet/ArcStudy.js';
@@ -63,11 +63,11 @@ function ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F(c) {
   let matchResult = void 0, fsworkbook = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Study") {
+      if (c.DTOType === "ISA_Study") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
+          if (c.DTO instanceof FsWorkbook) {
             matchResult = 0;
-            fsworkbook = value(c.DTO);
+            fsworkbook = c.DTO;
           } else {
             matchResult = 1;
           }

package/dist/ts/ts/Contract/ArcWorkflow.d.ts

@@ -1,10 +1,24 @@
+import { CWLProcessingUnit_$union } from '../CWL/CWLProcessingUnit.ts';
+import { CWLParameterReference } from '../CWL/ParameterReference.ts';
 import { MutableArray } from '@fable-org/fable-library-ts/Util.ts';
 import { Option } from '@fable-org/fable-library-ts/Option.ts';
-import { Contract } from './Contract.ts';
+import { Operation, Contract } from './Contract.ts';
 import { ArcWorkflow } from '../Core/ArcTypes.ts';
-import { CWLProcessingUnit_$union } from '../CWL/CWLProcessingUnit.ts';
-export declare function $007CWorkflowPath$007C_$007C(input: MutableArray<string>): Option<string>;
-export declare function $007CWorkflowCWLPath$007C_$007C(input: MutableArray<string>): Option<string>;
+/**
+ * Decodes the text of the CWL file at the path.
+ */
+export declare function CWLFileReading_decodeCWLFile(path: string, text: string): CWLProcessingUnit_$union;
+/**
+ * Decodes the text of the parameter file at the path.
+ */
+export declare function CWLFileReading_decodeParameterFile(path: string, text: string): CWLParameterReference[];
+export declare function WorkflowContractExtensions_$007CWorkflowPath$007C_$007C(input: MutableArray<string>): Option<string>;
+export declare function WorkflowContractExtensions_$007CWorkflowCWLPath$007C_$007C(input: MutableArray<string>): Option<string>;
+/**
+ * The contract that carries the CWL file of the workflow, or none for a workflow without a description. The
+ * operation is CREATE for a file that is new and UPDATE for a file that changed.
+ */
+export declare function ARCtrl_ArcWorkflow__ArcWorkflow_TryToCWLContract_Z2D283928(this$: ArcWorkflow, operation: Operation): Option<Contract>;
 export declare function ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(this$: ArcWorkflow, WithFolder?: boolean): MutableArray<Contract>;
 export declare function ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract(this$: ArcWorkflow): Contract;
 export declare function ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract(this$: ArcWorkflow): Contract;

package/dist/ts/ts/Contract/ArcWorkflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArcWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ArcWorkflow.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAA6B,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE1F,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0BxF;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0B3F;AAED,wBAAgB,yDAAyD,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAW1I;AAED,wBAAgB,gDAAgD,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAG7F;AAED,wBAAgB,gDAAgD,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAG7F;AAED,wBAAgB,iEAAiE,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAEjH;AAED,wBAAgB,gEAAgE,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAEpJ;AAED,wBAAgB,iEAAiE,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAEjH;AAED,wBAAgB,mEAAmE,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAmCpH;AAED,wBAAgB,6DAA6D,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAyCvJ"}
+{"version":3,"file":"ArcWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ArcWorkflow.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAIrE,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAsB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGnF,OAAO,EAAgB,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AA0BlD;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAEjG;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAEtG;AAED,wBAAgB,uDAAuD,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0BnH;AAED,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CA0BtH;AAED;;;GAGG;AACH,wBAAgB,0DAA0D,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAYrI;AAED,wBAAgB,yDAAyD,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAW1I;AAED,wBAAgB,gDAAgD,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAG7F;AAED,wBAAgB,gDAAgD,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAG7F;AAED,wBAAgB,iEAAiE,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAEjH;AAED,wBAAgB,gEAAgE,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAEpJ;AAED,wBAAgB,iEAAiE,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAEjH;AAED,wBAAgB,mEAAmE,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAmCpH;AAED,wBAAgB,6DAA6D,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAyCvJ"}

package/dist/ts/ts/Contract/ArcWorkflow.js

@@ -1,17 +1,43 @@
+import { concat } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { YamlDecodeException, DecodeError } from '../fable_modules/YAMLicious.2.0.0/Decode.fs.js';
+import { YamlParseException } from '../fable_modules/YAMLicious.2.0.0/Reader.fs.js';
+import { YamlError } from '../fable_modules/YAMLicious.2.0.0/Source.fs.js';
+import { Decode_decodeCWLProcessingUnit, DecodeParameters_decodeYAMLParameterFile } from '../CWL/Decode.js';
 import { equalsWith, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { combineMany, getWorkflowFolderPath } from '../FileSystem/Path.js';
 import { defaultOf } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { defaultArg, value, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
-import { Workflow_fileNameFromIdentifier, Workflow_cwlFileNameFromIdentifier } from '../Core/Helper/Identifier.js';
+import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Workflow_cwlFileNameFromIdentifier, Workflow_fileNameFromIdentifier } from '../Core/Helper/Identifier.js';
+import { encodeProcessingUnit } from '../CWL/Encode.js';
 import { Contract } from './Contract.js';
 import { ARCtrl_ArcWorkflow__ArcWorkflow_toFsWorkbook_Static_Z1C75CB0E, ARCtrl_ArcWorkflow__ArcWorkflow_fromFsWorkbook_Static_32154C9D } from '../Spreadsheet/ArcWorkflow.js';
 import { toArray, delay, append, collect, singleton, empty } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { FileSystemTree } from '../FileSystem/FileSystemTree.js';
-import { encodeProcessingUnit } from '../CWL/Encode.js';
 import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
-import { Decode_decodeCWLProcessingUnit } from '../CWL/Decode.js';
 
-function $007CWorkflowPath$007C_$007C(input) {
+function CWLFileReading_readingFile(path, read) {
+  const withFile = (message) => concat(message, " (file ", path, ")");
+  try {
+    return read();
+  } catch (matchValue) {
+    if (matchValue instanceof YamlDecodeException) {
+      const error = matchValue.Data0;
+      throw new YamlDecodeException(new DecodeError(withFile(error.Message), error.Path, error.Span));
+    } else if (matchValue instanceof YamlParseException) {
+      const error_1 = matchValue.Data0;
+      throw new YamlParseException(new YamlError(error_1.Code, withFile(error_1.Message), error_1.Span, error_1.Related));
+    } else {
+      throw matchValue;
+    }
+  }
+}
+function CWLFileReading_decodeCWLFile(path, text) {
+  return CWLFileReading_readingFile(path, () => Decode_decodeCWLProcessingUnit(text));
+}
+function CWLFileReading_decodeParameterFile(path, text) {
+  return CWLFileReading_readingFile(path, () => DecodeParameters_decodeYAMLParameterFile(text));
+}
+function WorkflowContractExtensions_$007CWorkflowPath$007C_$007C(input) {
   let matchResult = void 0;
   if (!equalsWith((x, y) => x === y, input, defaultOf()) && input.length === 3) {
     if (item(0, input) === "workflows") {
@@ -35,7 +61,7 @@ function $007CWorkflowPath$007C_$007C(input) {
       return void 0;
   }
 }
-function $007CWorkflowCWLPath$007C_$007C(input) {
+function WorkflowContractExtensions_$007CWorkflowCWLPath$007C_$007C(input) {
   let matchResult = void 0;
   if (!equalsWith((x, y) => x === y, input, defaultOf()) && input.length === 3) {
     if (item(0, input) === "workflows") {
@@ -59,6 +85,18 @@ function $007CWorkflowCWLPath$007C_$007C(input) {
       return void 0;
   }
 }
+function ARCtrl_ArcWorkflow__ArcWorkflow_TryToCWLContract_Z2D283928(this$, operation) {
+  let description = void 0, path = void 0, dto = void 0;
+  const option_1 = this$.CWLDescription;
+  if (option_1 != null) {
+    return description = option_1, path = Workflow_cwlFileNameFromIdentifier(this$.Identifier), dto = encodeProcessingUnit(description), Contract.create(operation, path, {
+      dtoType: "CWL",
+      dto
+    });
+  } else {
+    return void 0;
+  }
+}
 function ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(this$, WithFolder) {
   const withFolder = defaultArg(WithFolder, false);
   const path = Workflow_fileNameFromIdentifier(this$.Identifier);
@@ -66,8 +104,8 @@ function ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(this$, WithFo
   return toArray(delay(() => {
     let folderFS = void 0;
     return append(withFolder ? (folderFS = FileSystemTree.createWorkflowsFolder([FileSystemTree.createWorkflowFolder(this$.Identifier)]), collect((p) => p !== path && p !== "workflows/.gitkeep" ? singleton(Contract.createCreate(p, "PlainText")) : empty(), folderFS.ToFilePaths(false))) : empty(), delay(() => {
-      let path_1 = void 0, dto = void 0;
-      return append(this$.CWLDescription != null ? (path_1 = Workflow_cwlFileNameFromIdentifier(this$.Identifier), dto = encodeProcessingUnit(value(this$.CWLDescription)), singleton(Contract.createCreate(path_1, "CWL", dto))) : empty(), delay(() => singleton(c)));
+      let matchValue = void 0;
+      return append((matchValue = ARCtrl_ArcWorkflow__ArcWorkflow_TryToCWLContract_Z2D283928(this$, "CREATE"), matchValue == null ? empty() : singleton(matchValue)), delay(() => singleton(c)));
     }));
   }));
 }
@@ -92,11 +130,11 @@ function ARCtrl_ArcWorkflow__ArcWorkflow_tryFromReadContract_Static_7570923F(c)
   let matchResult = void 0, fsworkbook = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Workflow") {
+      if (c.DTOType === "ISA_Workflow") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
+          if (c.DTO instanceof FsWorkbook) {
             matchResult = 0;
-            fsworkbook = value(c.DTO);
+            fsworkbook = c.DTO;
           } else {
             matchResult = 1;
           }
@@ -124,12 +162,12 @@ function ARCtrl_ArcWorkflow__ArcWorkflow_tryCWLFromReadContract_Static(workflowI
   let matchResult = void 0, cwl_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "CWL") {
+      if (c.DTOType === "CWL") {
         if (c.DTO != null) {
-          if (typeof value(c.DTO) === "string") {
-            if (value(c.DTO), c.Path === p) {
+          if (typeof c.DTO === "string") {
+            if (c.DTO, c.Path === p) {
               matchResult = 0;
-              cwl_1 = value(c.DTO);
+              cwl_1 = c.DTO;
             } else {
               matchResult = 1;
             }
@@ -150,10 +188,10 @@ function ARCtrl_ArcWorkflow__ArcWorkflow_tryCWLFromReadContract_Static(workflowI
   }
   switch (matchResult) {
     case 0:
-      return Decode_decodeCWLProcessingUnit(cwl_1);
+      return CWLFileReading_decodeCWLFile(c.Path, cwl_1);
     default:
       return void 0;
   }
 }
 
-export { $007CWorkflowCWLPath$007C_$007C, $007CWorkflowPath$007C_$007C, ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49, ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract, ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract, ARCtrl_ArcWorkflow__ArcWorkflow_toCreateContract_Static_3B1E4D7B, ARCtrl_ArcWorkflow__ArcWorkflow_toDeleteContract_Static_Z1C75CB0E, ARCtrl_ArcWorkflow__ArcWorkflow_toUpdateContract_Static_Z1C75CB0E, ARCtrl_ArcWorkflow__ArcWorkflow_tryCWLFromReadContract_Static, ARCtrl_ArcWorkflow__ArcWorkflow_tryFromReadContract_Static_7570923F };
+export { ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49, ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract, ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract, ARCtrl_ArcWorkflow__ArcWorkflow_TryToCWLContract_Z2D283928, ARCtrl_ArcWorkflow__ArcWorkflow_toCreateContract_Static_3B1E4D7B, ARCtrl_ArcWorkflow__ArcWorkflow_toDeleteContract_Static_Z1C75CB0E, ARCtrl_ArcWorkflow__ArcWorkflow_toUpdateContract_Static_Z1C75CB0E, ARCtrl_ArcWorkflow__ArcWorkflow_tryCWLFromReadContract_Static, ARCtrl_ArcWorkflow__ArcWorkflow_tryFromReadContract_Static_7570923F, CWLFileReading_decodeCWLFile, CWLFileReading_decodeParameterFile, WorkflowContractExtensions_$007CWorkflowCWLPath$007C_$007C, WorkflowContractExtensions_$007CWorkflowPath$007C_$007C };

package/dist/ts/ts/Contract/Datamap.d.ts.map

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

package/dist/ts/ts/Contract/Datamap.js

@@ -1,7 +1,6 @@
 import { equalsWith, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { combineMany } from '../FileSystem/Path.js';
 import { defaultOf, safeHash } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Assay_datamapFileNameFromIdentifier, Study_datamapFileNameFromIdentifier, Workflow_datamapFileNameFromIdentifier, Run_datamapFileNameFromIdentifier } from '../Core/Helper/Identifier.js';
 import { Contract } from './Contract.js';
 import { toFsWorkbook, fromFsWorkbook } from '../Spreadsheet/Datamap.js';
@@ -84,12 +83,12 @@ function ARCtrl_Datamap__Datamap_tryFromReadContractForAssay_Static(assayIdentif
   let matchResult = void 0, fsworkbook_1 = void 0, p_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Datamap") {
+      if (c.DTOType === "ISA_Datamap") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
-            if (value(c.DTO), c.Path === path) {
+          if (c.DTO instanceof FsWorkbook) {
+            if (c.DTO, c.Path === path) {
               matchResult = 0;
-              fsworkbook_1 = value(c.DTO);
+              fsworkbook_1 = c.DTO;
               p_1 = c.Path;
             } else {
               matchResult = 1;
@@ -142,12 +141,12 @@ function ARCtrl_Datamap__Datamap_tryFromReadContractForStudy_Static(studyIdentif
   let matchResult = void 0, fsworkbook_1 = void 0, p_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Datamap") {
+      if (c.DTOType === "ISA_Datamap") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
-            if (value(c.DTO), c.Path === path) {
+          if (c.DTO instanceof FsWorkbook) {
+            if (c.DTO, c.Path === path) {
               matchResult = 0;
-              fsworkbook_1 = value(c.DTO);
+              fsworkbook_1 = c.DTO;
               p_1 = c.Path;
             } else {
               matchResult = 1;
@@ -200,12 +199,12 @@ function ARCtrl_Datamap__Datamap_tryFromReadContractForWorkflow_Static(workflowI
   let matchResult = void 0, fsworkbook_1 = void 0, p_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Datamap") {
+      if (c.DTOType === "ISA_Datamap") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
-            if (value(c.DTO), c.Path === path) {
+          if (c.DTO instanceof FsWorkbook) {
+            if (c.DTO, c.Path === path) {
               matchResult = 0;
-              fsworkbook_1 = value(c.DTO);
+              fsworkbook_1 = c.DTO;
               p_1 = c.Path;
             } else {
               matchResult = 1;
@@ -258,12 +257,12 @@ function ARCtrl_Datamap__Datamap_tryFromReadContractForRun_Static(runIdentifier,
   let matchResult = void 0, fsworkbook_1 = void 0, p_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "ISA_Datamap") {
+      if (c.DTOType === "ISA_Datamap") {
         if (c.DTO != null) {
-          if (value(c.DTO) instanceof FsWorkbook) {
-            if (value(c.DTO), c.Path === path) {
+          if (c.DTO instanceof FsWorkbook) {
+            if (c.DTO, c.Path === path) {
               matchResult = 0;
-              fsworkbook_1 = value(c.DTO);
+              fsworkbook_1 = c.DTO;
               p_1 = c.Path;
             } else {
               matchResult = 1;

package/dist/ts/ts/Contract/Git.js

@@ -66,7 +66,7 @@ function Clone_formatRepoString(username, pass, url) {
 function Clone_createCloneContract_5000466F(remoteUrl, merge, branch, token, nolfs) {
   const nolfs_1 = defaultArg(nolfs, false);
   const merge_1 = defaultArg(merge, false);
-  const remoteUrl_1 = token == null ? remoteUrl : Clone_formatRepoString(value(token)[0], value(token)[1], remoteUrl);
+  const remoteUrl_1 = token == null ? remoteUrl : Clone_formatRepoString(token[0], token[1], remoteUrl);
   return createGitContract(toArray(delay(() => append(singleton(Clone_get_clone()), delay(() => append(nolfs_1 ? singleton(Clone_get_noLFSConfig()) : empty(), delay(() => append(branch != null ? singleton(Clone_get_branchFlag()) : empty(), delay(() => append(branch != null ? singleton(value(branch)) : empty(), delay(() => append(singleton(remoteUrl_1), delay(() => merge_1 ? singleton(".") : empty())))))))))))));
 }
 

package/dist/ts/ts/Contract/ValidationPackagesConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationPackagesConfig.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ValidationPackagesConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,eAAO,MAAM,6CAA6C,EAAE,MAAyD,CAAC;AAEtH,eAAO,MAAM,2CAA2C,EAAE,QAAiG,CAAC;AAE5J,wBAAgB,6EAA6E,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAwBzI;AAED,wBAAgB,6FAA6F,CAAC,KAAK,EAAE,wBAAwB,GAAG,QAAQ,CAEvJ;AAED,wBAAgB,6FAA6F,CAAC,KAAK,EAAE,wBAAwB,GAAG,QAAQ,CAEvJ;AAED,wBAAgB,6GAA6G,CAAC,MAAM,EAAE,wBAAwB,GAAG,QAAQ,CAExK;AAED,wBAAgB,6GAA6G,CAAC,MAAM,EAAE,wBAAwB,GAAG,QAAQ,CAExK;AAED,wBAAgB,gHAAgH,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAyC9K"}
+{"version":3,"file":"ValidationPackagesConfig.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Contract/ValidationPackagesConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAa,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,eAAO,MAAM,6CAA6C,EAAE,MAAyD,CAAC;AAEtH,eAAO,MAAM,2CAA2C,EAAE,QAAiG,CAAC;AAE5J,wBAAgB,6EAA6E,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAwBzI;AAED,wBAAgB,6FAA6F,CAAC,KAAK,EAAE,wBAAwB,GAAG,QAAQ,CAEvJ;AAED,wBAAgB,6FAA6F,CAAC,KAAK,EAAE,wBAAwB,GAAG,QAAQ,CAEvJ;AAED,wBAAgB,6GAA6G,CAAC,MAAM,EAAE,wBAAwB,GAAG,QAAQ,CAExK;AAED,wBAAgB,6GAA6G,CAAC,MAAM,EAAE,wBAAwB,GAAG,QAAQ,CAExK;AAED,wBAAgB,gHAAgH,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAyC9K"}

package/dist/ts/ts/Contract/ValidationPackagesConfig.js

@@ -2,7 +2,6 @@ import { combineMany } from '../FileSystem/Path.js';
 import { Contract } from './Contract.js';
 import { equalsWith, item } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { defaultOf } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
-import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5 } from '../Yaml/ValidationPackagesConfig.js';
 
 const ValidationPackagesConfigHelper_ConfigFilePath = combineMany([".arc", "validation_packages.yml"]);
@@ -45,13 +44,13 @@ function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesC
   let matchResult = void 0, p_1 = void 0, yaml_1 = void 0;
   if (c.Operation === "READ") {
     if (c.DTOType != null) {
-      if (value(c.DTOType) === "YAML") {
+      if (c.DTOType === "YAML") {
         if (c.DTO != null) {
-          if (typeof value(c.DTO) === "string") {
-            if (value(c.DTO), c.Path === ValidationPackagesConfigHelper_ConfigFilePath) {
+          if (typeof c.DTO === "string") {
+            if (c.DTO, c.Path === ValidationPackagesConfigHelper_ConfigFilePath) {
               matchResult = 0;
               p_1 = c.Path;
-              yaml_1 = value(c.DTO);
+              yaml_1 = c.DTO;
             } else {
               matchResult = 1;
             }

package/dist/ts/ts/ContractIO/ContractIO.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContractIO.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/ContractIO/ContractIO.ts"],"names":[],"mappings":"AAGA,OAAO,EAAqB,qBAAqB,EAAyB,MAAM,uCAAuC,CAAC;AACxH,OAAO,EAAoC,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAqB,MAAM,qCAAqC,CAAC;AAGtF,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAYtE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CA+CxH;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CA2E3G;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CA+BxQ;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAoClJ;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CA2B1H;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAwC3H;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAW3H;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAQzI;AAED,wBAAgB,0BAA0B,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAE9L"}
+{"version":3,"file":"ContractIO.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/ContractIO/ContractIO.ts"],"names":[],"mappings":"AAGA,OAAO,EAAqB,qBAAqB,EAAyB,MAAM,uCAAuC,CAAC;AACxH,OAAO,EAAoC,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAqB,MAAM,qCAAqC,CAAC;AAGtF,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAY/D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CA+CxH;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CA2E3G;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CA+BxQ;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAoClJ;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CA2B1H;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAwC3H;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAW3H;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAQzI;AAED,wBAAgB,0BAA0B,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAE9L"}

package/dist/ts/ts/ContractIO/ContractIO.js

@@ -5,7 +5,6 @@ import { Contract } from '../Contract/Contract.js';
 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, 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';
@@ -24,7 +23,7 @@ function fulfillReadContractAsync(basePath, c) {
     const matchValue = c.DTOType;
     let matchResult = void 0;
     if (matchValue != null) {
-      switch (value(matchValue)) {
+      switch (matchValue) {
         case "ISA_Assay":
         case "ISA_Investigation":
         case "ISA_Study":
@@ -68,7 +67,7 @@ function tryFulfillEmptyEntityContractAsync(basePath, c) {
     const matchValue = c.DTOType;
     let matchResult = void 0;
     if (matchValue != null) {
-      switch (value(matchValue)) {
+      switch (matchValue) {
         case "ISA_Assay":
         case "ISA_Study":
         case "ISA_Workflow":
@@ -91,7 +90,7 @@ function tryFulfillEmptyEntityContractAsync(basePath, c) {
             const matchValue_1 = c.DTOType;
             let matchResult_1 = void 0;
             if (matchValue_1 != null) {
-              switch (value(matchValue_1)) {
+              switch (matchValue_1) {
                 case "ISA_Assay": {
                   matchResult_1 = 0;
                   break;
@@ -183,12 +182,12 @@ function fulfillWriteContractAsync(forceOverwrite, basePath, c) {
       if (matchValue == null) {
         const path_2 = combine(basePath, c.Path);
         return ensureDirectoryOfFileAsync(path_2).then(() => writeFileTextAsync(path_2, "").then(() => Promise.resolve(FSharpResult$2_Ok(c))));
-      } else if (typeof value(matchValue) === "string") {
-        const t = value(matchValue);
+      } else if (typeof matchValue === "string") {
+        const t = matchValue;
         const path = combine(basePath, c.Path);
         return ensureDirectoryOfFileAsync(path).then(() => writeFileTextAsync(path, t).then(() => Promise.resolve(FSharpResult$2_Ok(c))));
-      } else if (value(matchValue) instanceof FsWorkbook) {
-        const wb = value(matchValue);
+      } else if (matchValue instanceof FsWorkbook) {
+        const wb = matchValue;
         const path_1 = combine(basePath, c.Path);
         return ensureDirectoryOfFileAsync(path_1).then(() => writeFileXlsxAsync(path_1, wb).then(() => Promise.resolve(FSharpResult$2_Ok(c))));
       } else {
@@ -209,12 +208,12 @@ function fulfillUpdateContractAsync(basePath, c) {
     if (matchValue == null) {
       const path_2 = combine(basePath, c.Path);
       return ensureDirectoryOfFileAsync(path_2).then(() => writeFileTextAsync(path_2, "").then(() => Promise.resolve(FSharpResult$2_Ok(c))));
-    } else if (typeof value(matchValue) === "string") {
-      const t = value(matchValue);
+    } else if (typeof matchValue === "string") {
+      const t = matchValue;
       const path = combine(basePath, c.Path);
       return ensureDirectoryOfFileAsync(path).then(() => writeFileTextAsync(path, t).then(() => Promise.resolve(FSharpResult$2_Ok(c))));
-    } else if (value(matchValue) instanceof FsWorkbook) {
-      const wb = value(matchValue);
+    } else if (matchValue instanceof FsWorkbook) {
+      const wb = matchValue;
       const path_1 = combine(basePath, c.Path);
       return ensureDirectoryOfFileAsync(path_1).then(() => writeFileXlsxAsync(path_1, wb).then(() => Promise.resolve(FSharpResult$2_Ok(c))));
     } else {
@@ -233,13 +232,13 @@ function fullfillRenameContractAsync(basePath, c) {
     const matchValue = c.DTO;
     let matchResult = void 0, t_1 = void 0, t_2 = void 0;
     if (matchValue != null) {
-      if (typeof value(matchValue) === "string") {
-        if (value(matchValue) === c.Path) {
+      if (typeof matchValue === "string") {
+        if (matchValue === c.Path) {
           matchResult = 0;
-          t_1 = value(matchValue);
+          t_1 = matchValue;
         } else {
           matchResult = 1;
-          t_2 = value(matchValue);
+          t_2 = matchValue;
         }
       } else {
         matchResult = 2;

package/dist/ts/ts/Conversion/Assay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Assay.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Assay.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,OAAO,EAAE,QAAQ,EAAoB,MAAM,qBAAqB,CAAC;AAQjE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,qBAAa,eAAe;;CAG3B;AAED,wBAAgB,2BAA2B,IAAI,QAAQ,CAEtD;AAED,wBAAgB,kDAAkD,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAkBtK;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,MAAM,CAyB/F;AAED,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAiBtH"}
+{"version":3,"file":"Assay.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Conversion/Assay.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAYzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,OAAO,EAAE,QAAQ,EAAoB,MAAM,qBAAqB,CAAC;AAQjE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,qBAAa,eAAe;;CAG3B;AAED,wBAAgB,2BAA2B,IAAI,QAAQ,CAEtD;AAED,wBAAgB,kDAAkD,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAuBtK;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,UAAU,GAAG,MAAM,CA0B/F;AAED,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,GAAG,QAAQ,CAiBtH"}