@nfdi4plants/arctrl 2.0.0-beta.8 → 2.0.1

package/Spreadsheet/ArcInvestigation.js

@@ -10,17 +10,17 @@ import { Option_fromValueWithDefault, ResizeArray_iter } from "../Core/Helper/Co
 import { List_distinctBy, List_distinct } from "../fable_modules/fable-library-js.4.16.0/Seq2.js";
 import { comparePrimitives, getEnumerator, stringHash } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ArcStudy, ArcInvestigation } from "../Core/ArcTypes.js";
-import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/OntologySourceReference.js";
-import { toRows as toRows_2, fromRows as fromRows_2 } from "./Metadata/Publication.js";
-import { toRows as toRows_3, fromRows as fromRows_3 } from "./Metadata/Contacts.js";
-import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js";
-import { iterateIndexed, map as map_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { toRows, fromRows } from "./Metadata/OntologySourceReference.js";
+import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Publication.js";
+import { toRows as toRows_2, fromRows as fromRows_2 } from "./Metadata/Contacts.js";
+import { toRows as toRows_3, fromRows as fromRows_3 } from "./Metadata/Study.js";
+import { iterateIndexed, map as map_1, tryFind as tryFind_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { tryFind, ofList } from "../fable_modules/fable-library-js.4.16.0/Map.js";
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
-export class InvestigationInfo extends Record {
+export class ArcInvestigation_InvestigationInfo extends Record {
     constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {
         super();
         this.Identifier = Identifier;
@@ -32,25 +32,25 @@ export class InvestigationInfo extends Record {
     }
 }
 
-export function InvestigationInfo_$reflection() {
-    return record_type("ARCtrl.Spreadsheet.ArcInvestigation.InvestigationInfo", [], InvestigationInfo, () => [["Identifier", string_type], ["Title", string_type], ["Description", string_type], ["SubmissionDate", string_type], ["PublicReleaseDate", string_type], ["Comments", list_type(Comment$_$reflection())]]);
+export function ArcInvestigation_InvestigationInfo_$reflection() {
+    return record_type("ARCtrl.Spreadsheet.ArcInvestigation.InvestigationInfo", [], ArcInvestigation_InvestigationInfo, () => [["Identifier", string_type], ["Title", string_type], ["Description", string_type], ["SubmissionDate", string_type], ["PublicReleaseDate", string_type], ["Comments", list_type(Comment$_$reflection())]]);
 }
 
-export function InvestigationInfo_create(identifier, title, description, submissionDate, publicReleaseDate, comments) {
-    return new InvestigationInfo(identifier, title, description, submissionDate, publicReleaseDate, comments);
+export function ArcInvestigation_InvestigationInfo_create(identifier, title, description, submissionDate, publicReleaseDate, comments) {
+    return new ArcInvestigation_InvestigationInfo(identifier, title, description, submissionDate, publicReleaseDate, comments);
 }
 
-export function InvestigationInfo_get_Labels() {
+export function ArcInvestigation_InvestigationInfo_get_Labels() {
     return ofArray(["Investigation Identifier", "Investigation Title", "Investigation Description", "Investigation Submission Date", "Investigation Public Release Date"]);
 }
 
-export function InvestigationInfo_FromSparseTable_3ECCA699(matrix) {
+export function ArcInvestigation_InvestigationInfo_FromSparseTable_3ECCA699(matrix) {
     const comments = map((k) => Comment_fromString(k, SparseTable__TryGetValueDefault_5BAE6133(matrix, "", [k, 0])), matrix.CommentKeys);
-    return InvestigationInfo_create(SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Identifier", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Title", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Description", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Submission Date", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Public Release Date", 0]), comments);
+    return ArcInvestigation_InvestigationInfo_create(SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Identifier", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Title", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Description", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Submission Date", 0]), SparseTable__TryGetValueDefault_5BAE6133(matrix, "", ["Investigation Public Release Date", 0]), comments);
 }
 
-export function InvestigationInfo_ToSparseTable_Z720BD3FF(investigation) {
-    const matrix = SparseTable_Create_Z2192E64B(void 0, InvestigationInfo_get_Labels(), void 0, 2);
+export function ArcInvestigation_InvestigationInfo_ToSparseTable_Z720BD3FF(investigation) {
+    const matrix = SparseTable_Create_Z2192E64B(void 0, ArcInvestigation_InvestigationInfo_get_Labels(), void 0, 2);
     let commentKeys = empty();
     addToDict(matrix.Matrix, ["Investigation Identifier", 1], investigation.Identifier);
     addToDict(matrix.Matrix, ["Investigation Title", 1], defaultArg(investigation.Title, ""));
@@ -69,16 +69,16 @@ export function InvestigationInfo_ToSparseTable_Z720BD3FF(investigation) {
     })), matrix.ColumnCount);
 }
 
-export function InvestigationInfo_fromRows(lineNumber, rows) {
-    const tupledArg = SparseTable_FromRows_Z5579EC29(rows, InvestigationInfo_get_Labels(), lineNumber);
-    return [tupledArg[0], tupledArg[1], tupledArg[2], InvestigationInfo_FromSparseTable_3ECCA699(tupledArg[3])];
+export function ArcInvestigation_InvestigationInfo_fromRows(lineNumber, rows) {
+    const tupledArg = SparseTable_FromRows_Z5579EC29(rows, ArcInvestigation_InvestigationInfo_get_Labels(), lineNumber);
+    return [tupledArg[0], tupledArg[1], tupledArg[2], ArcInvestigation_InvestigationInfo_FromSparseTable_3ECCA699(tupledArg[3])];
 }
 
-export function InvestigationInfo_toRows_Z720BD3FF(investigation) {
-    return SparseTable_ToRows_759CAFC1(InvestigationInfo_ToSparseTable_Z720BD3FF(investigation));
+export function ArcInvestigation_InvestigationInfo_toRows_Z720BD3FF(investigation) {
+    return SparseTable_ToRows_759CAFC1(ArcInvestigation_InvestigationInfo_ToSparseTable_Z720BD3FF(investigation));
 }
 
-export function fromParts(investigationInfo, ontologySourceReference, publications, contacts, studies, assays, remarks) {
+export function ArcInvestigation_fromParts(investigationInfo, ontologySourceReference, publications, contacts, studies, assays, remarks) {
     const studyIdentifiers = map((s) => s.Identifier, studies);
     const title = Option_fromValueWithDefault("", investigationInfo.Title);
     const description = Option_fromValueWithDefault("", investigationInfo.Description);
@@ -95,9 +95,9 @@ export function fromParts(investigationInfo, ontologySourceReference, publicatio
     return ArcInvestigation.make(investigationInfo.Identifier, title, description, submissionDate, publicReleaseDate, ontologySourceReferences, publications_1, contacts_1, assays_1, studies_1, registeredStudyIdentifiers, comments, remarks_1);
 }
 
-export function fromRows(rows) {
+export function ArcInvestigation_fromRows(rows) {
     const en = getEnumerator(rows);
-    const emptyInvestigationInfo = InvestigationInfo_create("", "", "", "", "", empty());
+    const emptyInvestigationInfo = ArcInvestigation_InvestigationInfo_create("", "", "", "", "", empty());
     const loop = (lastLine_mut, ontologySourceReferences_mut, investigationInfo_mut, publications_mut, contacts_mut, studies_mut, remarks_mut, lineNumber_mut) => {
         loop:
         while (true) {
@@ -142,7 +142,7 @@ export function fromRows(rows) {
             }
             switch (matchResult) {
                 case 0: {
-                    const patternInput = fromRows_1(lineNumber + 1, en);
+                    const patternInput = fromRows(lineNumber + 1, en);
                     lastLine_mut = patternInput[0];
                     ontologySourceReferences_mut = patternInput[3];
                     investigationInfo_mut = investigationInfo;
@@ -154,7 +154,7 @@ export function fromRows(rows) {
                     continue loop;
                 }
                 case 1: {
-                    const patternInput_1 = InvestigationInfo_fromRows(lineNumber + 1, en);
+                    const patternInput_1 = ArcInvestigation_InvestigationInfo_fromRows(lineNumber + 1, en);
                     lastLine_mut = patternInput_1[0];
                     ontologySourceReferences_mut = ontologySourceReferences;
                     investigationInfo_mut = patternInput_1[3];
@@ -166,7 +166,7 @@ export function fromRows(rows) {
                     continue loop;
                 }
                 case 2: {
-                    const patternInput_2 = fromRows_2("Investigation Publication", lineNumber + 1, en);
+                    const patternInput_2 = fromRows_1("Investigation Publication", lineNumber + 1, en);
                     lastLine_mut = patternInput_2[0];
                     ontologySourceReferences_mut = ontologySourceReferences;
                     investigationInfo_mut = investigationInfo;
@@ -178,7 +178,7 @@ export function fromRows(rows) {
                     continue loop;
                 }
                 case 3: {
-                    const patternInput_3 = fromRows_3("Investigation Person", lineNumber + 1, en);
+                    const patternInput_3 = fromRows_2("Investigation Person", lineNumber + 1, en);
                     lastLine_mut = patternInput_3[0];
                     ontologySourceReferences_mut = ontologySourceReferences;
                     investigationInfo_mut = investigationInfo;
@@ -190,7 +190,7 @@ export function fromRows(rows) {
                     continue loop;
                 }
                 case 4: {
-                    const patternInput_4 = fromRows_4(lineNumber + 1, en);
+                    const patternInput_4 = fromRows_3(lineNumber + 1, en);
                     const study = patternInput_4[3];
                     const newRemarks_4 = patternInput_4[2];
                     const lineNumber_6 = patternInput_4[1] | 0;
@@ -225,7 +225,7 @@ export function fromRows(rows) {
                         Equals: (x, y) => (x === y),
                         GetHashCode: stringHash,
                     })];
-                    return fromParts(investigationInfo, ontologySourceReferences, publications, contacts, patternInput_5[0], patternInput_5[1], remarks);
+                    return ArcInvestigation_fromParts(investigationInfo, ontologySourceReferences, publications, contacts, patternInput_5[0], patternInput_5[1], remarks);
                 }
             }
             break;
@@ -239,11 +239,11 @@ export function fromRows(rows) {
     }
 }
 
-export function toRows(investigation) {
+export function ArcInvestigation_toRows(investigation) {
     let remarks, rows;
-    return (remarks = ofSeq(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofSeq(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z720BD3FF(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofSeq(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofSeq(investigation.Contacts)), delay(() => collect((studyIdentifier) => {
+    return (remarks = ofSeq(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows(ofSeq(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(ArcInvestigation_InvestigationInfo_toRows_Z720BD3FF(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_1("Investigation Publication", ofSeq(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_2("Investigation Person", ofSeq(investigation.Contacts)), delay(() => collect((studyIdentifier) => {
         const study = defaultArg(investigation.TryGetStudy(studyIdentifier), new ArcStudy(studyIdentifier));
-        return append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_4(study, void 0)));
+        return append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_3(study, void 0)));
     }, investigation.RegisteredStudyIdentifiers)))))))))))))))))), (() => {
         try {
             const rm = ofList(map((remark) => Remark.toTuple(remark), remarks), {
@@ -283,12 +283,29 @@ export function toRows(investigation) {
     })()));
 }
 
-export function fromFsWorkbook(doc) {
-    let sheet_2, matchValue, matchValue_1;
+export function ArcInvestigation_isMetadataSheetName(name) {
+    if (name === "isa_investigation") {
+        return true;
+    }
+    else {
+        return name === "Investigation";
+    }
+}
+
+export function ArcInvestigation_isMetadataSheet(sheet) {
+    return ArcInvestigation_isMetadataSheetName(sheet.Name);
+}
+
+export function ArcInvestigation_tryGetMetadataSheet(doc) {
+    return tryFind_1(ArcInvestigation_isMetadataSheet, doc.GetWorksheets());
+}
+
+export function ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D(doc) {
+    let sheet_1, matchValue;
     try {
-        return fromRows(map_1(SparseRowModule_fromFsRow, (sheet_2 = ((matchValue = doc.TryGetWorksheetByName("isa_investigation"), (matchValue == null) ? ((matchValue_1 = doc.TryGetWorksheetByName("Investigation"), (matchValue_1 == null) ? (() => {
+        return ArcInvestigation_fromRows(map_1(SparseRowModule_fromFsRow, (sheet_1 = ((matchValue = ArcInvestigation_tryGetMetadataSheet(doc), (matchValue == null) ? (() => {
             throw new Error("Could not find metadata sheet with sheetname \"isa_investigation\" or deprecated sheetname \"Investigation\"");
-        })() : matchValue_1)) : matchValue)), FsWorksheet.getRows(sheet_2))));
+        })() : matchValue)), FsWorksheet.getRows(sheet_1))));
     }
     catch (err) {
         const arg = err.message;
@@ -296,13 +313,13 @@ export function fromFsWorkbook(doc) {
     }
 }
 
-export function toFsWorkbook(investigation) {
+export function ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(investigation) {
     try {
         const wb = new FsWorkbook();
         const sheet = new FsWorksheet("isa_investigation");
         iterateIndexed((rowI, r) => {
             SparseRowModule_writeToSheet(rowI + 1, r, sheet);
-        }, toRows(investigation));
+        }, ArcInvestigation_toRows(investigation));
         wb.AddWorksheet(sheet);
         return wb;
     }
@@ -312,3 +329,7 @@ export function toFsWorkbook(investigation) {
     }
 }
 
+export function ARCtrl_ArcInvestigation__ArcInvestigation_ToFsWorkbook(this$) {
+    return ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(this$);
+}
+

package/Spreadsheet/ArcStudy.js

@@ -1,14 +1,14 @@
 import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
-import { iterate, tryPick, map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { iterate, tryPick, tryFind, map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
 import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { toArray, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { unwrap, toArray, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { getEnumerator } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ArcStudy } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { empty } from "../fable_modules/fable-library-js.4.16.0/List.js";
-import { ResizeArray_iter, ResizeArray_isEmpty, ResizeArray_choose } from "../Core/Helper/Collections.js";
+import { ResizeArray_isEmpty, ResizeArray_choose } from "../Core/Helper/Collections.js";
 import { toFsWorksheet as toFsWorksheet_1, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
 import { toFsWorksheet, tryFromFsWorksheet as tryFromFsWorksheet_1 } from "./DataMapTable/DataMapTable.js";
 import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
@@ -33,22 +33,33 @@ export function ArcStudy_fromMetadataSheet(sheet) {
     }
 }
 
+export function ArcStudy_isMetadataSheetName(name) {
+    if (name === "isa_study") {
+        return true;
+    }
+    else {
+        return name === "Study";
+    }
+}
+
+export function ArcStudy_isMetadataSheet(sheet) {
+    return ArcStudy_isMetadataSheetName(sheet.Name);
+}
+
+export function ArcStudy_tryGetMetadataSheet(doc) {
+    return tryFind(ArcStudy_isMetadataSheet, doc.GetWorksheets());
+}
+
 /**
  * Reads an assay from a spreadsheet
  */
 export function ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc) {
     try {
         let patternInput;
-        const matchValue = doc.TryGetWorksheetByName("isa_study");
+        const matchValue = ArcStudy_tryGetMetadataSheet(doc);
         if (matchValue == null) {
-            const matchValue_1 = doc.TryGetWorksheetByName("Study");
-            if (matchValue_1 == null) {
-                toConsole(printf("Cannot retrieve metadata: Study file does not contain \"%s\" or \"%s\" sheet."))("isa_study")("Study");
-                patternInput = [ArcStudy.create(createMissingIdentifier()), empty()];
-            }
-            else {
-                patternInput = ArcStudy_fromMetadataSheet(matchValue_1);
-            }
+            toConsole(printf("Cannot retrieve metadata: Study file does not contain \"%s\" or \"%s\" sheet."))("isa_study")("Study");
+            patternInput = [ArcStudy.create(createMissingIdentifier()), empty()];
         }
         else {
             patternInput = ArcStudy_fromMetadataSheet(matchValue);
@@ -77,18 +88,22 @@ export function ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc) {
 export function ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(study, assays, datamapSheet) {
     const datamapSheet_1 = defaultArg(datamapSheet, true);
     const doc = new FsWorkbook();
-    const metaDataSheet = ArcStudy_toMetadataSheet(study, assays);
-    doc.AddWorksheet(metaDataSheet);
+    const metadataSheet = ArcStudy_toMetadataSheet(study, assays);
+    doc.AddWorksheet(metadataSheet);
     if (datamapSheet_1) {
         iterate((arg) => {
             const sheet = toFsWorksheet(arg);
             doc.AddWorksheet(sheet);
         }, toArray(study.DataMap));
     }
-    ResizeArray_iter((arg_1) => {
-        const sheet_1 = toFsWorksheet_1(arg_1);
+    iterateIndexed((i, arg_1) => {
+        const sheet_1 = toFsWorksheet_1(i, arg_1);
         doc.AddWorksheet(sheet_1);
     }, study.Tables);
     return doc;
 }
 
+export function ARCtrl_ArcStudy__ArcStudy_ToFsWorkbook_257FC1F0(this$, assays, datamapSheet) {
+    return ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$, unwrap(assays), unwrap(datamapSheet));
+}
+

package/Spreadsheet/Template.js

@@ -324,7 +324,7 @@ export function Template_toFsWorkbook(template) {
     const doc = new FsWorkbook();
     const metaDataSheet = Template_toMetadataSheet(template);
     doc.AddWorksheet(metaDataSheet);
-    const sheet = toFsWorksheet(template.Table);
+    const sheet = toFsWorksheet(void 0, template.Table);
     doc.AddWorksheet(sheet);
     return doc;
 }

package/ValidationPackages/ValidationPackage.js

@@ -1,12 +1,15 @@
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { value as value_1, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { join } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { empty, singleton, append, delay, toList } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { stringHash, equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { boxHashOption, boxHashArray } from "../Core/Helper/HashCodes.js";
 import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export class ValidationPackage {
     constructor(name, version) {
+        this.version = version;
         this._name = name;
-        this._version = version;
+        this._version = this.version;
     }
     get Name() {
         const this$ = this;
@@ -33,6 +36,10 @@ export class ValidationPackage {
         const version = this$.Version;
         return ValidationPackage.make(name, version);
     }
+    toString() {
+        const this$ = this;
+        return join("\n", toList(delay(() => append(singleton("{"), delay(() => append(singleton(` Name = ${this$.Name}`), delay(() => append((this$.version != null) ? singleton(` Version = ${value_1(this$.Version)}`) : empty(), delay(() => singleton("}"))))))))));
+    }
     Equals(obj) {
         let other_vp;
         const this$ = this;

package/ValidationPackages/ValidationPackagesConfig.js

@@ -1,13 +1,17 @@
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { equalsWith } from "../fable_modules/fable-library-js.4.16.0/Array.js";
-import { identityHash, equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { boxHashOption, boxHashArray } from "../Core/Helper/HashCodes.js";
+import { value, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { join } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { item, fold, length, map, empty, singleton, append, delay, toList } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { toString } from "../fable_modules/fable-library-js.4.16.0/Types.js";
+import { sortBy } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { equals, compareArrays } from "../fable_modules/fable-library-js.4.16.0/Util.js";
+import { rangeDouble } from "../fable_modules/fable-library-js.4.16.0/Range.js";
+import { boxHashSeq, boxHashOption, boxHashArray } from "../Core/Helper/HashCodes.js";
 import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export class ValidationPackagesConfig {
     constructor(validation_packages, arc_specification) {
-        this._validation_packages = validation_packages;
         this._arc_specification = arc_specification;
+        this._validation_packages = validation_packages;
     }
     get ValidationPackages() {
         const this$ = this;
@@ -34,14 +38,43 @@ export class ValidationPackagesConfig {
         const arc_specification = this$.ARCSpecification;
         return ValidationPackagesConfig.make(validation_packages, arc_specification);
     }
-    Equals(obj) {
-        let other_vpc;
+    toString() {
+        const this$ = this;
+        return join("\n", toList(delay(() => append(singleton("{"), delay(() => append((this$.ARCSpecification != null) ? singleton(` ARCSpecification = ${value(this$.ARCSpecification)}`) : empty(), delay(() => append(singleton(" ValidationPackages = ["), delay(() => append(singleton(join(`;${"\n"}`, map(toString, this$.ValidationPackages))), delay(() => append(singleton("]"), delay(() => singleton("}"))))))))))))));
+    }
+    StructurallyEquals(other) {
+        const this$ = this;
+        const sort = (arg) => sortBy((vp) => [vp.Name, vp.Version], Array.from(arg), {
+            Compare: compareArrays,
+        });
+        if (equals(this$.ARCSpecification, other.ARCSpecification)) {
+            const a = sort(this$.ValidationPackages);
+            const b = sort(other.ValidationPackages);
+            return (length(a) === length(b)) && fold((acc, e) => {
+                if (acc) {
+                    return e;
+                }
+                else {
+                    return false;
+                }
+            }, true, toList(delay(() => map((i) => equals(item(i, a), item(i, b)), rangeDouble(0, 1, length(a) - 1)))));
+        }
+        else {
+            return false;
+        }
+    }
+    ReferenceEquals(other) {
+        const this$ = this;
+        return this$ === other;
+    }
+    Equals(other) {
+        let other_vp;
         const this$ = this;
-        return (obj instanceof ValidationPackagesConfig) && ((other_vpc = obj, equalsWith(equals, other_vpc.ValidationPackages, this$.ValidationPackages) && equals(other_vpc.ARCSpecification, this$.ARCSpecification)));
+        return (other instanceof ValidationPackagesConfig) && ((other_vp = other, this$.StructurallyEquals(other_vp)));
     }
     GetHashCode() {
         const this$ = this;
-        return boxHashArray([identityHash(this$.ValidationPackages), boxHashOption(this$.ARCSpecification)]) | 0;
+        return boxHashArray([boxHashOption(this$.ARCSpecification), boxHashSeq(this$.ValidationPackages)]) | 0;
     }
 }
 

package/Xlsx.js

@@ -4,7 +4,7 @@ import { ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F, ARCtrl_ArcAssa
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522, ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D } from "./Spreadsheet/ArcStudy.js";
 import { map } from "./fable_modules/fable-library-js.4.16.0/Option.js";
 import { ofSeq } from "./fable_modules/fable-library-js.4.16.0/List.js";
-import { toFsWorkbook as toFsWorkbook_1, fromFsWorkbook as fromFsWorkbook_1 } from "./Spreadsheet/ArcInvestigation.js";
+import { ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF, ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D } from "./Spreadsheet/ArcInvestigation.js";
 
 export class XlsxHelper_DatamapXlsx {
     constructor() {
@@ -67,10 +67,10 @@ export class XlsxHelper_InvestigationXlsx {
     constructor() {
     }
     fromFsWorkbook(fswb) {
-        return fromFsWorkbook_1(fswb);
+        return ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D(fswb);
     }
     toFsWorkbook(investigation) {
-        return toFsWorkbook_1(investigation);
+        return ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(investigation);
     }
 }
 

package/Yaml/ValidationPackagesConfig.js

@@ -1,7 +1,7 @@
 import { ofArray, choose } from "../fable_modules/fable-library-js.4.16.0/List.js";
 import { equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { Config, YAMLElement } from "../fable_modules/YAMLicious.0.0.1/YAMLiciousTypes.fs.js";
-import { string, tryInclude, resizearray } from "../fable_modules/YAMLicious.0.0.1/Encode.fs.js";
+import { resizearray, string, tryInclude } from "../fable_modules/YAMLicious.0.0.1/Encode.fs.js";
 import { ValidationPackage_decoder, ValidationPackage_encoder } from "./ValidationPackage.js";
 import { singleton, collect, delay, toList } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { YAMLContent_create_27AED5E3 } from "../fable_modules/YAMLicious.0.0.1/YAMLiciousTypes.fs.js";
@@ -21,7 +21,7 @@ export function ValidationPackagesConfig_encoder(validationpackage) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([["validation_packages", resizearray(ValidationPackage_encoder, validationpackage.ValidationPackages)], tryInclude("arc_specification", string, validationpackage.ARCSpecification)]));
+    }, ofArray([tryInclude("arc_specification", string, validationpackage.ARCSpecification), ["validation_packages", resizearray(ValidationPackage_encoder, validationpackage.ValidationPackages)]]));
     return new YAMLElement(3, [toList(delay(() => collect((matchValue) => singleton(new YAMLElement(0, [YAMLContent_create_27AED5E3(matchValue[0]), matchValue[1]])), objSeq)))]);
 }