@nfdi4plants/arctrl 2.2.0 → 2.2.2

package/Json/Process/Material.js

@@ -7,7 +7,7 @@ import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encode
 import { ISAJson_decoder as ISAJson_decoder_2, ISAJson_encoder as ISAJson_encoder_2, ROCrate_decoder as ROCrate_decoder_2, ROCrate_encoder as ROCrate_encoder_2 } from "./MaterialAttributeValue.js";
 import { context_jsonvalue } from "../context/rocrate/isa_material_context.js";
 import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
-import { list as list_2, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { list as list_2, string, unit, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
 import { Material } from "../../Core/Process/Material.js";
 import { encode } from "../IDTable.js";
@@ -38,23 +38,47 @@ export function ROCrate_encoder(oa) {
         Encode(helpers_1) {
             return helpers_1.encodeString("Material");
         },
-    }))], tryInclude("name", (value_2) => ({
+    }))], ["additionalType", {
         Encode(helpers_2) {
-            return helpers_2.encodeString(value_2);
+            return helpers_2.encodeString("Material");
+        },
+    }], tryInclude("name", (value_3) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_3);
         },
     }), oa.Name), tryInclude("type", ROCrate_encoder_1, oa.MaterialType), tryIncludeListOpt("characteristics", ROCrate_encoder_2, oa.Characteristics), tryIncludeListOpt("derivesFrom", ROCrate_encoder, oa.DerivesFrom), ["@context", context_jsonvalue]]));
     return {
-        Encode(helpers_3) {
-            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
-            return helpers_3.encodeObject(arg);
+        Encode(helpers_4) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
         },
     };
 }
 
 export const ROCrate_decoder = (() => {
     const decode = () => object((get$) => {
-        let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
-        return new Material((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", ROCrate_decoder_1)), (arg_7 = list_2(ROCrate_decoder_2), (objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7))), (arg_9 = list_2(decode()), (objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9))));
+        let objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6;
+        let matchValue;
+        const objectArg = get$.Optional;
+        matchValue = objectArg.Field("additionalType", Decode_uri);
+        let matchResult;
+        if (matchValue == null) {
+            matchResult = 0;
+        }
+        else if (matchValue === "Material") {
+            matchResult = 0;
+        }
+        else {
+            matchResult = 1;
+        }
+        switch (matchResult) {
+            case 1: {
+                const objectArg_1 = get$.Required;
+                objectArg_1.Field("FailBecauseNotSample", unit);
+                break;
+            }
+        }
+        return new Material((objectArg_2 = get$.Optional, objectArg_2.Field("@id", Decode_uri)), (objectArg_3 = get$.Optional, objectArg_3.Field("name", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("type", ROCrate_decoder_1)), (arg_11 = list_2(ROCrate_decoder_2), (objectArg_5 = get$.Optional, objectArg_5.Field("characteristics", arg_11))), (arg_13 = list_2(decode()), (objectArg_6 = get$.Optional, objectArg_6.Field("derivesFrom", arg_13))));
     });
     return decode();
 })();

package/Json/Process/ProcessInput.js

@@ -1,7 +1,7 @@
-import { ISAJson_decoder as ISAJson_decoder_2, ISAJson_encoder as ISAJson_encoder_1, ROCrate_decoder as ROCrate_decoder_2, ROCrate_encoder as ROCrate_encoder_1 } from "./Sample.js";
+import { ISAJson_decoder as ISAJson_decoder_2, ISAJson_encoder as ISAJson_encoder_1, ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_1 } from "./Sample.js";
 import { ISAJson_decoder as ISAJson_decoder_3, ISAJson_encoder as ISAJson_encoder_2, ROCrate_decoder as ROCrate_decoder_3, ROCrate_encoder as ROCrate_encoder_2 } from "../Data.js";
 import { ISAJson_decoder as ISAJson_decoder_4, ISAJson_encoder as ISAJson_encoder_3, ROCrate_decoder as ROCrate_decoder_4, ROCrate_encoder as ROCrate_encoder_3 } from "./Material.js";
-import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_4, ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_4 } from "./Source.js";
+import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_4, ROCrate_decoder as ROCrate_decoder_2, ROCrate_encoder as ROCrate_encoder_4 } from "./Source.js";
 import { map, oneOf } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { ProcessInput } from "../../Core/Process/ProcessInput.js";
 import { ofArray } from "../../fable_modules/fable-library-js.4.22.0/List.js";
@@ -19,7 +19,7 @@ export function ROCrate_encoder(value) {
     }
 }
 
-export const ROCrate_decoder = oneOf(ofArray([map((Item) => (new ProcessInput(0, [Item])), ROCrate_decoder_1), map((Item_1) => (new ProcessInput(1, [Item_1])), ROCrate_decoder_2), map((Item_2) => (new ProcessInput(2, [Item_2])), ROCrate_decoder_3), map((Item_3) => (new ProcessInput(3, [Item_3])), ROCrate_decoder_4)]));
+export const ROCrate_decoder = oneOf(ofArray([map((Item) => (new ProcessInput(1, [Item])), ROCrate_decoder_1), map((Item_1) => (new ProcessInput(0, [Item_1])), ROCrate_decoder_2), map((Item_2) => (new ProcessInput(2, [Item_2])), ROCrate_decoder_3), map((Item_3) => (new ProcessInput(3, [Item_3])), ROCrate_decoder_4)]));
 
 export function ISAJson_encoder(idMap, value) {
     switch (value.tag) {

package/Json/Process/Sample.js

@@ -1,5 +1,5 @@
 import { replace } from "../../fable_modules/fable-library-js.4.22.0/String.js";
-import { ofArray, singleton, choose, append, empty, map } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { tail, head, isEmpty, ofArray, singleton, choose, append, empty, map } from "../../fable_modules/fable-library-js.4.22.0/List.js";
 import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_1, ROCrate_decoder as ROCrate_decoder_2, ROCrate_encoder as ROCrate_encoder_1 } from "./MaterialAttributeValue.js";
 import { map as map_1, defaultArg } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
 import { ISAJson_decoder as ISAJson_decoder_2, ISAJson_encoder as ISAJson_encoder_2, ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_2 } from "./FactorValue.js";
@@ -7,10 +7,10 @@ import { list as list_5 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode
 import { tryIncludeListOpt, tryIncludeList, tryInclude } from "../Encode.js";
 import { context_jsonvalue } from "../context/rocrate/isa_sample_context.js";
 import { map as map_2 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
-import { list as list_6, object, string } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { list as list_6, unit, object, string } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.22.0/Result.js";
-import { Option_fromValueWithDefault } from "../../Core/Helper/Collections.js";
 import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
+import { Option_fromValueWithDefault } from "../../Core/Helper/Collections.js";
 import { ISAJson_decoder as ISAJson_decoder_3, ISAJson_encoder as ISAJson_encoder_3, ROCrate_decoder as ROCrate_decoder_3 } from "./Source.js";
 import { Sample } from "../../Core/Process/Sample.js";
 import { encode } from "../IDTable.js";
@@ -44,15 +44,19 @@ export function ROCrate_encoder(oa) {
         Encode(helpers_1) {
             return helpers_1.encodeString("Sample");
         },
-    }))], tryInclude("name", (value_4) => ({
+    }))], ["additionalType", {
         Encode(helpers_2) {
-            return helpers_2.encodeString(value_4);
+            return helpers_2.encodeString("Sample");
+        },
+    }], tryInclude("name", (value_5) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_5);
         },
     }), oa.Name), tryIncludeList("additionalProperties", (x) => x, additionalProperties), ["@context", context_jsonvalue]]));
     return {
-        Encode(helpers_3) {
-            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
-            return helpers_3.encodeObject(arg);
+        Encode(helpers_4) {
+            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
         },
     };
 }
@@ -72,11 +76,62 @@ export const ROCrate_additionalPropertyDecoder = {
 };
 
 export const ROCrate_decoder = object((get$) => {
-    let objectArg_1, objectArg_2, arg_7, objectArg_3;
-    let additionalProperties;
-    const arg_1 = list_6(ROCrate_additionalPropertyDecoder);
+    let objectArg_5, objectArg_6, arg_15, objectArg_7;
+    let matchValue;
     const objectArg = get$.Optional;
-    additionalProperties = objectArg.Field("additionalProperties", arg_1);
+    matchValue = objectArg.Field("additionalType", Decode_uri);
+    let matchResult;
+    if (matchValue == null) {
+        matchResult = 0;
+    }
+    else if (matchValue === "Sample") {
+        matchResult = 0;
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 1: {
+            const objectArg_1 = get$.Required;
+            objectArg_1.Field("FailBecauseNotSample", unit);
+            break;
+        }
+    }
+    let matchValue_1;
+    const arg_5 = list_6(string);
+    const objectArg_2 = get$.Optional;
+    matchValue_1 = objectArg_2.Field("@type", arg_5);
+    let matchResult_1;
+    if (matchValue_1 == null) {
+        matchResult_1 = 0;
+    }
+    else if (!isEmpty(matchValue_1)) {
+        if (head(matchValue_1) === "Sample") {
+            if (isEmpty(tail(matchValue_1))) {
+                matchResult_1 = 0;
+            }
+            else {
+                matchResult_1 = 1;
+            }
+        }
+        else {
+            matchResult_1 = 1;
+        }
+    }
+    else {
+        matchResult_1 = 1;
+    }
+    switch (matchResult_1) {
+        case 1: {
+            const objectArg_3 = get$.Required;
+            objectArg_3.Field("FailBecauseNotSample", unit);
+            break;
+        }
+    }
+    let additionalProperties;
+    const arg_9 = list_6(ROCrate_additionalPropertyDecoder);
+    const objectArg_4 = get$.Optional;
+    additionalProperties = objectArg_4.Field("additionalProperties", arg_9);
     let patternInput;
     if (additionalProperties != null) {
         const additionalProperties_1 = additionalProperties;
@@ -85,7 +140,7 @@ export const ROCrate_decoder = object((get$) => {
     else {
         patternInput = [undefined, undefined];
     }
-    return new Sample((objectArg_1 = get$.Optional, objectArg_1.Field("@id", Decode_uri)), (objectArg_2 = get$.Optional, objectArg_2.Field("name", string)), patternInput[0], patternInput[1], (arg_7 = list_6(ROCrate_decoder_3), (objectArg_3 = get$.Optional, objectArg_3.Field("derivesFrom", arg_7))));
+    return new Sample((objectArg_5 = get$.Optional, objectArg_5.Field("@id", Decode_uri)), (objectArg_6 = get$.Optional, objectArg_6.Field("name", string)), patternInput[0], patternInput[1], (arg_15 = list_6(ROCrate_decoder_3), (objectArg_7 = get$.Optional, objectArg_7.Field("derivesFrom", arg_15))));
 });
 
 export function ISAJson_encoder(idMap, oa) {

package/Json/Process/Source.js

@@ -1,13 +1,13 @@
 import { replace } from "../../fable_modules/fable-library-js.4.22.0/String.js";
 import { URIModule_toString } from "../../Core/URI.js";
-import { ofArray, singleton, choose } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { tail, head, isEmpty, ofArray, singleton, choose } from "../../fable_modules/fable-library-js.4.22.0/List.js";
 import { map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
 import { list as list_1 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
 import { tryIncludeListOpt, tryInclude } from "../Encode.js";
 import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_1, ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_1 } from "./MaterialAttributeValue.js";
 import { context_jsonvalue } from "../context/rocrate/isa_source_context.js";
 import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
-import { list as list_2, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { string, list as list_2, unit, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
 import { Source } from "../../Core/Process/Source.js";
 import { encode } from "../IDTable.js";
@@ -38,22 +38,77 @@ export function ROCrate_encoder(oa) {
         Encode(helpers_1) {
             return helpers_1.encodeString("Source");
         },
-    }))], tryInclude("name", (value_2) => ({
+    }))], ["additionalType", {
         Encode(helpers_2) {
-            return helpers_2.encodeString(value_2);
+            return helpers_2.encodeString("Source");
+        },
+    }], tryInclude("name", (value_3) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_3);
         },
     }), oa.Name), tryIncludeListOpt("characteristics", ROCrate_encoder_1, oa.Characteristics), ["@context", context_jsonvalue]]));
     return {
-        Encode(helpers_3) {
-            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
-            return helpers_3.encodeObject(arg);
+        Encode(helpers_4) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
         },
     };
 }
 
 export const ROCrate_decoder = object((get$) => {
-    let objectArg, objectArg_1, arg_5, objectArg_2;
-    return new Source((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (arg_5 = list_2(ROCrate_decoder_1), (objectArg_2 = get$.Optional, objectArg_2.Field("characteristics", arg_5))));
+    let objectArg_4, objectArg_5, arg_13, objectArg_6;
+    let matchValue;
+    const objectArg = get$.Optional;
+    matchValue = objectArg.Field("additionalType", Decode_uri);
+    let matchResult;
+    if (matchValue == null) {
+        matchResult = 0;
+    }
+    else if (matchValue === "Source") {
+        matchResult = 0;
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 1: {
+            const objectArg_1 = get$.Required;
+            objectArg_1.Field("FailBecauseNotSample", unit);
+            break;
+        }
+    }
+    let matchValue_1;
+    const arg_5 = list_2(string);
+    const objectArg_2 = get$.Optional;
+    matchValue_1 = objectArg_2.Field("@type", arg_5);
+    let matchResult_1;
+    if (matchValue_1 == null) {
+        matchResult_1 = 0;
+    }
+    else if (!isEmpty(matchValue_1)) {
+        if (head(matchValue_1) === "Source") {
+            if (isEmpty(tail(matchValue_1))) {
+                matchResult_1 = 0;
+            }
+            else {
+                matchResult_1 = 1;
+            }
+        }
+        else {
+            matchResult_1 = 1;
+        }
+    }
+    else {
+        matchResult_1 = 1;
+    }
+    switch (matchResult_1) {
+        case 1: {
+            const objectArg_3 = get$.Required;
+            objectArg_3.Field("FailBecauseNotSample", unit);
+            break;
+        }
+    }
+    return new Source((objectArg_4 = get$.Optional, objectArg_4.Field("@id", Decode_uri)), (objectArg_5 = get$.Optional, objectArg_5.Field("name", string)), (arg_13 = list_2(ROCrate_decoder_1), (objectArg_6 = get$.Optional, objectArg_6.Field("characteristics", arg_13))));
 });
 
 export function ISAJson_encoder(idMap, oa) {

package/Json/context/rocrate/isa_assay_context.js

@@ -3,7 +3,7 @@ import { record_type, string_type } from "../../../fable_modules/fable-library-j
 import { map } from "../../../fable_modules/fable-library-js.4.22.0/Seq.js";
 
 export class IContext extends Record {
-    constructor(sdo, arc, Assay, ArcAssay, measurementType, technologyType, technologyPlatform, dataFiles, materials, otherMaterials, samples, characteristicCategories, processSequences, unitCategories, comments, filename) {
+    constructor(sdo, arc, Assay, ArcAssay, measurementType, technologyType, technologyPlatform, dataFiles, materials, otherMaterials, samples, characteristicCategories, processSequence, unitCategories, comments, filename) {
         super();
         this.sdo = sdo;
         this.arc = arc;
@@ -17,7 +17,7 @@ export class IContext extends Record {
         this.otherMaterials = otherMaterials;
         this.samples = samples;
         this.characteristicCategories = characteristicCategories;
-        this.processSequences = processSequences;
+        this.processSequence = processSequence;
         this.unitCategories = unitCategories;
         this.comments = comments;
         this.filename = filename;
@@ -25,7 +25,7 @@ export class IContext extends Record {
 }
 
 export function IContext_$reflection() {
-    return record_type("ARCtrl.Json.ROCrateContext.Assay.IContext", [], IContext, () => [["sdo", string_type], ["arc", string_type], ["Assay", string_type], ["ArcAssay", string_type], ["measurementType", string_type], ["technologyType", string_type], ["technologyPlatform", string_type], ["dataFiles", string_type], ["materials", string_type], ["otherMaterials", string_type], ["samples", string_type], ["characteristicCategories", string_type], ["processSequences", string_type], ["unitCategories", string_type], ["comments", string_type], ["filename", string_type]]);
+    return record_type("ARCtrl.Json.ROCrateContext.Assay.IContext", [], IContext, () => [["sdo", string_type], ["arc", string_type], ["Assay", string_type], ["ArcAssay", string_type], ["measurementType", string_type], ["technologyType", string_type], ["technologyPlatform", string_type], ["dataFiles", string_type], ["materials", string_type], ["otherMaterials", string_type], ["samples", string_type], ["characteristicCategories", string_type], ["processSequence", string_type], ["unitCategories", string_type], ["comments", string_type], ["filename", string_type]]);
 }
 
 export const context_jsonvalue = (() => {
@@ -65,7 +65,7 @@ export const context_jsonvalue = (() => {
         Encode(helpers_8) {
             return helpers_8.encodeString("sdo:creator");
         },
-    }], ["processSequences", {
+    }], ["processSequence", {
         Encode(helpers_9) {
             return helpers_9.encodeString("sdo:about");
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nfdi4plants/arctrl",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "main": "index.js",