npm - @shaclmate/compiler - Versions diffs - 4.0.39 → 4.0.41 - Mend

@shaclmate/compiler 4.0.39 → 4.0.41

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 (211) hide show

package/dist/input/generated.js CHANGED Viewed

@@ -15,11 +15,6 @@ function $compactRecord(record) {
         return definedProperties;
     }, {});
 }
-function $convertToArray(convertToItem, _readonly) {
-    return (value) => (typeof value === "undefined"
-        ? Either.of([])
-        : Either.sequence(value.map(convertToItem)));
-}
 function $convertToIdentifier(value) {
     switch (typeof value) {
         case "object":
@@ -56,6 +51,9 @@ function $convertToIri(value) {
             return Either.of(dataFactory.namedNode(value));
     }
 }
+function $convertToList(convertToItem, _readonly) {
+    return (value) => Either.sequence(value.map(convertToItem));
+}
 function $convertToLiteral(value) {
     if (typeof value === "object") {
         if (value instanceof Date) {
@@ -80,6 +78,19 @@ function $convertToMaybe(convertToItem) {
         return convertToItem(value).map(Maybe.of);
     };
 }
+function $convertToScalarSet(convertToItem, _readonly) {
+    return (value) => {
+        if (typeof value === "undefined") {
+            return Either.of([]);
+        }
+        if (Array.isArray(value)) {
+            return Either.sequence(value.map(convertToItem));
+        }
+        return convertToItem(value).map((value) => [
+            value,
+        ]);
+    };
+}
 function $convertWithDefaultValue(convertToItem, defaultValue) {
     return (value) => {
         if (typeof value === "undefined") {
@@ -282,25 +293,30 @@ export var PropertyShape;
     function create(parameters) {
         return $sequenceRecord({
             $identifier: $convertToIdentifierProperty(parameters.$identifier),
-            and: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.and.type, value)),
-            classes: $convertToArray(($convertToIri), true)(parameters.classes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.classes.type, value)),
+            and: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.and.type, value)),
+            classes: $convertToScalarSet(($convertToIri), true)(parameters.classes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.classes.type, value)),
             comment: $convertToMaybe($identityConversionFunction)(parameters.comment).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.comment.type, value)),
             datatype: $convertToMaybe(($convertToIri))(parameters.datatype).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.datatype.type, value)),
             deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.deactivated.type, value)),
             defaultValue: $convertToMaybe($identityConversionFunction)(parameters.defaultValue).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.defaultValue.type, value)),
             description: $convertToMaybe($identityConversionFunction)(parameters.description).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.description.type, value)),
+            disjoint: $convertToScalarSet(($convertToIri), true)(parameters.disjoint).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.disjoint.type, value)),
             display: $convertWithDefaultValue($identityConversionFunction, false)(parameters.display),
-            flags: $convertToArray($identityConversionFunction, true)(parameters.flags).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.flags.type, value)),
-            groups: $convertToArray($convertToIdentifier, true)(parameters.groups).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.groups.type, value)),
-            hasValues: $convertToArray($identityConversionFunction, true)(parameters.hasValues).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.hasValues.type, value)),
-            in_: $convertToMaybe($convertToArray($identityConversionFunction, true))(parameters.in_).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.in_.type, value)),
+            equals: $convertToScalarSet(($convertToIri), true)(parameters.equals).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.equals.type, value)),
+            flags: $convertToMaybe($identityConversionFunction)(parameters.flags).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.flags.type, value)),
+            groups: $convertToScalarSet($convertToIdentifier, true)(parameters.groups).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.groups.type, value)),
+            hasValues: $convertToScalarSet($identityConversionFunction, true)(parameters.hasValues).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.hasValues.type, value)),
+            in_: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters.in_).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.in_.type, value)),
             isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.isDefinedBy.type, value)),
             label: $convertToMaybe($identityConversionFunction)(parameters.label).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.label.type, value)),
-            languageIn: $convertToMaybe($convertToArray($identityConversionFunction, true))(parameters.languageIn).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.languageIn.type, value)),
+            languageIn: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters.languageIn).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.languageIn.type, value)),
+            lessThan: $convertToScalarSet(($convertToIri), true)(parameters.lessThan).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.lessThan.type, value)),
+            lessThanOrEquals: $convertToScalarSet(($convertToIri), true)(parameters.lessThanOrEquals).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.lessThanOrEquals.type, value)),
             maxCount: $convertToMaybe($identityConversionFunction)(parameters.maxCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxCount.type, value)),
             maxExclusive: $convertToMaybe($convertToLiteral)(parameters.maxExclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxExclusive.type, value)),
             maxInclusive: $convertToMaybe($convertToLiteral)(parameters.maxInclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxInclusive.type, value)),
             maxLength: $convertToMaybe($identityConversionFunction)(parameters.maxLength).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxLength.type, value)),
+            message: $convertToMaybe($identityConversionFunction)(parameters.message).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.message.type, value)),
             minCount: $convertToMaybe($identityConversionFunction)(parameters.minCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minCount.type, value)),
             minExclusive: $convertToMaybe($convertToLiteral)(parameters.minExclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minExclusive.type, value)),
             minInclusive: $convertToMaybe($convertToLiteral)(parameters.minInclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minInclusive.type, value)),
@@ -309,15 +325,24 @@ export var PropertyShape;
             name: $convertToMaybe($identityConversionFunction)(parameters.name).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.name.type, value)),
             node: $convertToMaybe($convertToIdentifier)(parameters.node).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.node.type, value)),
             nodeKind: $convertToMaybe(($convertToIri))(parameters.nodeKind).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.nodeKind.type, value)),
-            not: $convertToArray($convertToIdentifier, true)(parameters.not).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.not.type, value)),
-            or: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters.or).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.or.type, value)),
+            not: $convertToScalarSet($convertToIdentifier, true)(parameters.not).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.not.type, value)),
+            or: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters.or).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.or.type, value)),
             order: $convertToMaybe($identityConversionFunction)(parameters.order).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.order.type, value)),
             path: Either.of(parameters.path),
-            patterns: $convertToArray($identityConversionFunction, true)(parameters.patterns).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.patterns.type, value)),
+            pattern: $convertToMaybe($identityConversionFunction)(parameters.pattern).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.pattern.type, value)),
+            qualifiedMaxCount: $convertToMaybe($identityConversionFunction)(parameters.qualifiedMaxCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedMaxCount.type, value)),
+            qualifiedMinCount: $convertToMaybe($identityConversionFunction)(parameters.qualifiedMinCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedMinCount.type, value)),
+            qualifiedValueShape: $convertToMaybe($convertToIdentifier)(parameters.qualifiedValueShape).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedValueShape.type, value)),
+            qualifiedValueShapesDisjoint: $convertToMaybe($identityConversionFunction)(parameters.qualifiedValueShapesDisjoint).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedValueShapesDisjoint.type, value)),
             resolve: $convertToMaybe($convertToIdentifier)(parameters.resolve).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.resolve.type, value)),
+            severity: $convertToMaybe(($convertToIri))(parameters.severity).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.severity.type, value)),
             shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.shaclmateName.type, value)),
+            targetClasses: $convertToScalarSet(($convertToIri), true)(parameters.targetClasses).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetClasses.type, value)),
+            targetNodes: $convertToScalarSet($identityConversionFunction, true)(parameters.targetNodes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetNodes.type, value)),
+            targetObjectsOf: $convertToScalarSet(($convertToIri), true)(parameters.targetObjectsOf).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetObjectsOf.type, value)),
+            targetSubjectsOf: $convertToScalarSet(($convertToIri), true)(parameters.targetSubjectsOf).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetSubjectsOf.type, value)),
             uniqueLang: $convertToMaybe($identityConversionFunction)(parameters.uniqueLang).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.uniqueLang.type, value)),
-            xone: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters.xone).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.xone.type, value)),
+            xone: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters.xone).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.xone.type, value)),
         }).map((properties) => $monkeyPatchObject({ ...properties, $type: "PropertyShape" }, { $toString }));
     }
     PropertyShape.create = create;
@@ -462,6 +487,19 @@ export var PropertyShape;
                         value: Maybe.empty(),
                     })),
             }),
+            disjoint: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.disjoint,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.disjoint.path,
+                    value: valuesArray,
+                })),
+            }),
             display: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -477,20 +515,34 @@ export var PropertyShape;
                     }).toValues())
                     .chain((values) => values.chainMap((value) => value.toBoolean())),
             }),
-            flags: $shaclPropertyFromRdf({
+            equals: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
-                propertySchema: PropertyShape.schema.properties.flags,
+                propertySchema: PropertyShape.schema.properties.equals,
                 typeFromRdf: (resourceValues) => resourceValues
-                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .chain((values) => values.chainMap((value) => value.toIri()))
                     .map((values) => values.toArray())
                     .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.flags.path,
+                    propertyPath: PropertyShape.schema.properties.equals.path,
                     value: valuesArray,
                 })),
             }),
+            flags: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.flags,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.flags.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
             groups: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -614,6 +666,32 @@ export var PropertyShape;
                         value: Maybe.empty(),
                     })),
             }),
+            lessThan: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.lessThan,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.lessThan.path,
+                    value: valuesArray,
+                })),
+            }),
+            lessThanOrEquals: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.lessThanOrEquals,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.lessThanOrEquals.path,
+                    value: valuesArray,
+                })),
+            }),
             maxCount: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -672,6 +750,21 @@ export var PropertyShape;
                         value: Maybe.empty(),
                     })),
             }),
+            message: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.message,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.message.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
             minCount: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -854,19 +947,78 @@ export var PropertyShape;
                     propertyPath: PropertyShape.schema.properties.path.path,
                 }),
             }),
-            patterns: $shaclPropertyFromRdf({
+            pattern: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
-                propertySchema: PropertyShape.schema.properties.patterns,
+                propertySchema: PropertyShape.schema.properties.pattern,
                 typeFromRdf: (resourceValues) => resourceValues
                     .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                     .chain((values) => values.chainMap((value) => value.toString()))
-                    .map((values) => values.toArray())
-                    .map((valuesArray) => Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.patterns.path,
-                    value: valuesArray,
-                })),
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.pattern.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            qualifiedMaxCount: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.qualifiedMaxCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.qualifiedMaxCount.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            qualifiedMinCount: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.qualifiedMinCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.qualifiedMinCount.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            qualifiedValueShape: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.qualifiedValueShape,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.qualifiedValueShape
+                            .path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            qualifiedValueShapesDisjoint: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.qualifiedValueShapesDisjoint,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties
+                            .qualifiedValueShapesDisjoint.path,
+                        value: Maybe.empty(),
+                    })),
             }),
             resolve: $shaclPropertyFromRdf({
                 graph: _$options.graph,
@@ -882,6 +1034,24 @@ export var PropertyShape;
                         value: Maybe.empty(),
                     })),
             }),
+            severity: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.severity,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Info"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Warning"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Violation"),
+                ])))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.severity.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
             shaclmateName: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -897,6 +1067,71 @@ export var PropertyShape;
                         value: Maybe.empty(),
                     })),
             }),
+            targetClasses: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.targetClasses,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetClasses.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetNodes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.targetNodes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.targetNodes.path,
+                            }));
+                    }
+                })))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetNodes.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetObjectsOf: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.targetObjectsOf,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetObjectsOf.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetSubjectsOf: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.targetSubjectsOf,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetSubjectsOf.path,
+                    value: valuesArray,
+                })),
+            }),
             uniqueLang: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -1003,6 +1238,11 @@ export var PropertyShape;
                     itemType: { kind: "String" },
                 },
             },
+            disjoint: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#disjoint"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             display: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#display"),
@@ -1012,10 +1252,18 @@ export var PropertyShape;
                     defaultValue: false,
                 },
             },
+            equals: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#equals"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             flags: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
             },
             groups: {
                 kind: "Shacl",
@@ -1068,6 +1316,16 @@ export var PropertyShape;
                     },
                 },
             },
+            lessThan: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThan"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            lessThanOrEquals: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThanOrEquals"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             maxCount: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"),
@@ -1100,6 +1358,14 @@ export var PropertyShape;
                     itemType: { kind: "BigInt" },
                 },
             },
+            message: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#message"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
+            },
             minCount: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"),
@@ -1205,10 +1471,45 @@ export var PropertyShape;
                     return $PropertyPath.schema;
                 },
             },
-            patterns: {
+            pattern: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
+            },
+            qualifiedMaxCount: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMaxCount"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "BigInt" },
+                },
+            },
+            qualifiedMinCount: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMinCount"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "BigInt" },
+                },
+            },
+            qualifiedValueShape: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShape"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "Identifier" },
+                },
+            },
+            qualifiedValueShapesDisjoint: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShapesDisjoint"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "Boolean" },
+                },
             },
             resolve: {
                 kind: "Shacl",
@@ -1218,6 +1519,21 @@ export var PropertyShape;
                     itemType: { kind: "Identifier" },
                 },
             },
+            severity: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
+                type: {
+                    kind: "Option",
+                    itemType: {
+                        kind: "Iri",
+                        in: [
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Info"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Warning"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Violation"),
+                        ],
+                    },
+                },
+            },
             shaclmateName: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
@@ -1226,6 +1542,26 @@ export var PropertyShape;
                     itemType: { kind: "String" },
                 },
             },
+            targetClasses: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetNodes: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetNode"),
+                type: { kind: "Set", itemType: { kind: "Term" } },
+            },
+            targetObjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetObjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetSubjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             uniqueLang: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"),
@@ -1287,12 +1623,16 @@ export var PropertyShape;
         parameters.resource.add(PropertyShape.schema.properties.description.path, parameters.object.description
             .toList()
             .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.disjoint.path, parameters.object.disjoint.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.display.path, $strictEquals(parameters.object.display, false).isLeft()
             ? [
                 $literalFactory.boolean(parameters.object.display, $RdfVocabularies.xsd.boolean),
             ]
             : [], parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.flags.path, parameters.object.flags.flatMap((item) => [$literalFactory.string(item)]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.equals.path, parameters.object.equals.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.flags.path, parameters.object.flags
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.groups.path, parameters.object.groups.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.hasValues.path, parameters.object.hasValues.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.in_.path, parameters.object.in_.toList().flatMap((value) => [
@@ -1343,6 +1683,8 @@ export var PropertyShape;
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.lessThan.path, parameters.object.lessThan.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.lessThanOrEquals.path, parameters.object.lessThanOrEquals.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.maxCount.path, parameters.object.maxCount
             .toList()
             .flatMap((value) => [
@@ -1355,6 +1697,9 @@ export var PropertyShape;
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
         ]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.message.path, parameters.object.message
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.minCount.path, parameters.object.minCount
             .toList()
             .flatMap((value) => [
@@ -1411,13 +1756,34 @@ export var PropertyShape;
                 resourceSet: parameters.resourceSet,
             }).identifier,
         ], parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.patterns.path, parameters.object.patterns.flatMap((item) => [
-            $literalFactory.string(item),
+        parameters.resource.add(PropertyShape.schema.properties.pattern.path, parameters.object.pattern
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.qualifiedMaxCount.path, parameters.object.qualifiedMaxCount
+            .toList()
+            .flatMap((value) => [
+            $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
+        ]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.qualifiedMinCount.path, parameters.object.qualifiedMinCount
+            .toList()
+            .flatMap((value) => [
+            $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
+        ]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.qualifiedValueShape.path, parameters.object.qualifiedValueShape.toList(), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.qualifiedValueShapesDisjoint.path, parameters.object.qualifiedValueShapesDisjoint
+            .toList()
+            .flatMap((value) => [
+            $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.resolve.path, parameters.object.resolve.toList(), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.severity.path, parameters.object.severity.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.shaclmateName.path, parameters.object.shaclmateName
             .toList()
             .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetClasses.path, parameters.object.targetClasses.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetNodes.path, parameters.object.targetNodes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetObjectsOf.path, parameters.object.targetObjectsOf.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetSubjectsOf.path, parameters.object.targetSubjectsOf.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.uniqueLang.path, parameters.object.uniqueLang
             .toList()
             .flatMap((value) => [
@@ -1726,44 +2092,48 @@ export var NodeShape;
     function create(parameters) {
         return $sequenceRecord({
             $identifier: $convertToIdentifierProperty(parameters?.$identifier),
-            and: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters?.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.and.type, value)),
-            classes: $convertToArray(($convertToIri), true)(parameters?.classes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.classes.type, value)),
+            and: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters?.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.and.type, value)),
+            classes: $convertToScalarSet(($convertToIri), true)(parameters?.classes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.classes.type, value)),
             closed: $convertToMaybe($identityConversionFunction)(parameters?.closed).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.closed.type, value)),
             comment: $convertToMaybe($identityConversionFunction)(parameters?.comment).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.comment.type, value)),
             datatype: $convertToMaybe(($convertToIri))(parameters?.datatype).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.datatype.type, value)),
             deactivated: $convertToMaybe($identityConversionFunction)(parameters?.deactivated).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.deactivated.type, value)),
             discriminantValue: $convertToMaybe($identityConversionFunction)(parameters?.discriminantValue).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.discriminantValue.type, value)),
             extern: $convertToMaybe($identityConversionFunction)(parameters?.extern).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.extern.type, value)),
-            flags: $convertToArray($identityConversionFunction, true)(parameters?.flags).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.flags.type, value)),
+            flags: $convertToMaybe($identityConversionFunction)(parameters?.flags).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.flags.type, value)),
             fromRdfType: $convertToMaybe(($convertToIri))(parameters?.fromRdfType).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.fromRdfType.type, value)),
-            hasValues: $convertToArray($identityConversionFunction, true)(parameters?.hasValues).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.hasValues.type, value)),
-            ignoredProperties: $convertToMaybe($convertToArray(($convertToIri), true))(parameters?.ignoredProperties).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(NodeShape.schema.properties.ignoredProperties.type, value)),
-            in_: $convertToMaybe($convertToArray($identityConversionFunction, true))(parameters?.in_).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.in_.type, value)),
+            hasValues: $convertToScalarSet($identityConversionFunction, true)(parameters?.hasValues).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.hasValues.type, value)),
+            ignoredProperties: $convertToMaybe($convertToList(($convertToIri), true))(parameters?.ignoredProperties).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(NodeShape.schema.properties.ignoredProperties.type, value)),
+            in_: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters?.in_).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.in_.type, value)),
             isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters?.isDefinedBy).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.isDefinedBy.type, value)),
             label: $convertToMaybe($identityConversionFunction)(parameters?.label).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.label.type, value)),
-            languageIn: $convertToMaybe($convertToArray($identityConversionFunction, true))(parameters?.languageIn).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.languageIn.type, value)),
-            maxCount: $convertToMaybe($identityConversionFunction)(parameters?.maxCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxCount.type, value)),
+            languageIn: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters?.languageIn).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.languageIn.type, value)),
             maxExclusive: $convertToMaybe($convertToLiteral)(parameters?.maxExclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxExclusive.type, value)),
             maxInclusive: $convertToMaybe($convertToLiteral)(parameters?.maxInclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxInclusive.type, value)),
             maxLength: $convertToMaybe($identityConversionFunction)(parameters?.maxLength).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxLength.type, value)),
-            minCount: $convertToMaybe($identityConversionFunction)(parameters?.minCount).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minCount.type, value)),
+            message: $convertToMaybe($identityConversionFunction)(parameters?.message).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.message.type, value)),
             minExclusive: $convertToMaybe($convertToLiteral)(parameters?.minExclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minExclusive.type, value)),
             minInclusive: $convertToMaybe($convertToLiteral)(parameters?.minInclusive).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minInclusive.type, value)),
             minLength: $convertToMaybe($identityConversionFunction)(parameters?.minLength).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minLength.type, value)),
             mutable: $convertToMaybe($identityConversionFunction)(parameters?.mutable).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.mutable.type, value)),
             node: $convertToMaybe($convertToIdentifier)(parameters?.node).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.node.type, value)),
             nodeKind: $convertToMaybe(($convertToIri))(parameters?.nodeKind).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.nodeKind.type, value)),
-            not: $convertToArray($convertToIdentifier, true)(parameters?.not).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.not.type, value)),
-            or: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters?.or).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.or.type, value)),
-            patterns: $convertToArray($identityConversionFunction, true)(parameters?.patterns).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.patterns.type, value)),
-            properties: $convertToArray($convertToIdentifier, true)(parameters?.properties).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.properties.type, value)),
+            not: $convertToScalarSet($convertToIdentifier, true)(parameters?.not).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.not.type, value)),
+            or: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters?.or).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.or.type, value)),
+            pattern: $convertToMaybe($identityConversionFunction)(parameters?.pattern).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.pattern.type, value)),
+            properties: $convertToScalarSet($convertToIdentifier, true)(parameters?.properties).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.properties.type, value)),
             rdfType: $convertToMaybe(($convertToIri))(parameters?.rdfType).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.rdfType.type, value)),
+            severity: $convertToMaybe(($convertToIri))(parameters?.severity).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.severity.type, value)),
             shaclmateName: $convertToMaybe($identityConversionFunction)(parameters?.shaclmateName).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.shaclmateName.type, value)),
-            subClassOf: $convertToArray(($convertToIri), true)(parameters?.subClassOf).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.subClassOf.type, value)),
-            toRdfTypes: $convertToArray(($convertToIri), true)(parameters?.toRdfTypes).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.toRdfTypes.type, value)),
-            tsImports: $convertToArray($identityConversionFunction, true)(parameters?.tsImports).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.tsImports.type, value)),
-            types: $convertToArray(($convertToIri), true)(parameters?.types).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.types.type, value)),
-            xone: $convertToMaybe($convertToArray($convertToIdentifier, true))(parameters?.xone).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.xone.type, value)),
+            subClassOf: $convertToScalarSet(($convertToIri), true)(parameters?.subClassOf).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.subClassOf.type, value)),
+            targetClasses: $convertToScalarSet(($convertToIri), true)(parameters?.targetClasses).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetClasses.type, value)),
+            targetNodes: $convertToScalarSet($identityConversionFunction, true)(parameters?.targetNodes).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetNodes.type, value)),
+            targetObjectsOf: $convertToScalarSet(($convertToIri), true)(parameters?.targetObjectsOf).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetObjectsOf.type, value)),
+            targetSubjectsOf: $convertToScalarSet(($convertToIri), true)(parameters?.targetSubjectsOf).chain((value) => $validateArray($identityValidationFunction, true)(PropertyShape.schema.properties.targetSubjectsOf.type, value)),
+            toRdfTypes: $convertToScalarSet(($convertToIri), true)(parameters?.toRdfTypes).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.toRdfTypes.type, value)),
+            tsImports: $convertToScalarSet($identityConversionFunction, true)(parameters?.tsImports).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.tsImports.type, value)),
+            types: $convertToScalarSet(($convertToIri), true)(parameters?.types).chain((value) => $validateArray($identityValidationFunction, true)(NodeShape.schema.properties.types.type, value)),
+            xone: $convertToMaybe($convertToList($convertToIdentifier, true))(parameters?.xone).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(PropertyShape.schema.properties.xone.type, value)),
         }).map((properties) => $monkeyPatchObject({ ...properties, $type: "NodeShape" }, { $toString }));
     }
     NodeShape.create = create;
@@ -1916,12 +2286,13 @@ export var NodeShape;
                 typeFromRdf: (resourceValues) => resourceValues
                     .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                     .chain((values) => values.chainMap((value) => value.toString()))
-                    .map((values) => values.toArray())
-                    .map((valuesArray) => Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.flags.path,
-                    value: valuesArray,
-                })),
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.flags.path,
+                        value: Maybe.empty(),
+                    })),
             }),
             fromRdfType: $shaclPropertyFromRdf({
                 graph: _$options.graph,
@@ -2067,20 +2438,6 @@ export var NodeShape;
                         value: Maybe.empty(),
                     })),
             }),
-            maxCount: $shaclPropertyFromRdf({
-                graph: _$options.graph,
-                resource: $resource,
-                propertySchema: NodeShape.schema.properties.maxCount,
-                typeFromRdf: (resourceValues) => resourceValues
-                    .chain((values) => values.chainMap((value) => value.toBigInt()))
-                    .map((values) => values.length > 0
-                    ? values.map((value) => Maybe.of(value))
-                    : Resource.Values.fromValue({
-                        focusResource: $resource,
-                        propertyPath: PropertyShape.schema.properties.maxCount.path,
-                        value: Maybe.empty(),
-                    })),
-            }),
             maxExclusive: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -2125,17 +2482,18 @@ export var NodeShape;
                         value: Maybe.empty(),
                     })),
             }),
-            minCount: $shaclPropertyFromRdf({
+            message: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
-                propertySchema: NodeShape.schema.properties.minCount,
+                propertySchema: NodeShape.schema.properties.message,
                 typeFromRdf: (resourceValues) => resourceValues
-                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
                     .map((values) => values.length > 0
                     ? values.map((value) => Maybe.of(value))
                     : Resource.Values.fromValue({
                         focusResource: $resource,
-                        propertyPath: PropertyShape.schema.properties.minCount.path,
+                        propertyPath: PropertyShape.schema.properties.message.path,
                         value: Maybe.empty(),
                     })),
             }),
@@ -2265,19 +2623,20 @@ export var NodeShape;
                         value: Maybe.empty(),
                     })),
             }),
-            patterns: $shaclPropertyFromRdf({
+            pattern: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
-                propertySchema: NodeShape.schema.properties.patterns,
+                propertySchema: NodeShape.schema.properties.pattern,
                 typeFromRdf: (resourceValues) => resourceValues
                     .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                     .chain((values) => values.chainMap((value) => value.toString()))
-                    .map((values) => values.toArray())
-                    .map((valuesArray) => Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.patterns.path,
-                    value: valuesArray,
-                })),
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.pattern.path,
+                        value: Maybe.empty(),
+                    })),
             }),
             properties: $shaclPropertyFromRdf({
                 graph: _$options.graph,
@@ -2306,6 +2665,24 @@ export var NodeShape;
                         value: Maybe.empty(),
                     })),
             }),
+            severity: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.severity,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Info"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Warning"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Violation"),
+                ])))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.severity.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
             shaclmateName: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -2334,6 +2711,71 @@ export var NodeShape;
                     value: valuesArray,
                 })),
             }),
+            targetClasses: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.targetClasses,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetClasses.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetNodes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.targetNodes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.targetNodes.path,
+                            }));
+                    }
+                })))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetNodes.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetObjectsOf: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.targetObjectsOf,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetObjectsOf.path,
+                    value: valuesArray,
+                })),
+            }),
+            targetSubjectsOf: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.targetSubjectsOf,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.schema.properties.targetSubjectsOf.path,
+                    value: valuesArray,
+                })),
+            }),
             toRdfTypes: $shaclPropertyFromRdf({
                 graph: _$options.graph,
                 resource: $resource,
@@ -2480,7 +2922,10 @@ export var NodeShape;
             flags: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
             },
             fromRdfType: {
                 kind: "Shacl",
@@ -2541,14 +2986,6 @@ export var NodeShape;
                     },
                 },
             },
-            maxCount: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt" },
-                },
-            },
             maxExclusive: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"),
@@ -2573,12 +3010,12 @@ export var NodeShape;
                     itemType: { kind: "BigInt" },
                 },
             },
-            minCount: {
+            message: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#message"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "BigInt" },
+                    itemType: { kind: "String" },
                 },
             },
             minExclusive: {
@@ -2658,10 +3095,13 @@ export var NodeShape;
                     },
                 },
             },
-            patterns: {
+            pattern: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
             },
             properties: {
                 kind: "Shacl",
@@ -2676,6 +3116,21 @@ export var NodeShape;
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"),
                 type: { kind: "Option", itemType: { kind: "Iri" } },
             },
+            severity: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
+                type: {
+                    kind: "Option",
+                    itemType: {
+                        kind: "Iri",
+                        in: [
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Info"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Warning"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Violation"),
+                        ],
+                    },
+                },
+            },
             shaclmateName: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
@@ -2689,6 +3144,26 @@ export var NodeShape;
                 path: $RdfVocabularies.rdfs.subClassOf,
                 type: { kind: "Set", itemType: { kind: "Iri" } },
             },
+            targetClasses: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetNodes: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetNode"),
+                type: { kind: "Set", itemType: { kind: "Term" } },
+            },
+            targetObjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetObjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetSubjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             toRdfTypes: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"),
@@ -2766,7 +3241,9 @@ export var NodeShape;
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.flags.path, parameters.object.flags.flatMap((item) => [$literalFactory.string(item)]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.flags.path, parameters.object.flags
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.fromRdfType.path, parameters.object.fromRdfType.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.hasValues.path, parameters.object.hasValues.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.ignoredProperties.path, parameters.object.ignoredProperties.toList().flatMap((value) => [
@@ -2839,11 +3316,6 @@ export var NodeShape;
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.maxCount.path, parameters.object.maxCount
-            .toList()
-            .flatMap((value) => [
-            $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.maxExclusive.path, parameters.object.maxExclusive.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.maxInclusive.path, parameters.object.maxInclusive.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.maxLength.path, parameters.object.maxLength
@@ -2851,11 +3323,9 @@ export var NodeShape;
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
         ]), parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.minCount.path, parameters.object.minCount
+        parameters.resource.add(PropertyShape.schema.properties.message.path, parameters.object.message
             .toList()
-            .flatMap((value) => [
-            $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), parameters.graph);
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.minExclusive.path, parameters.object.minExclusive.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.minInclusive.path, parameters.object.minInclusive.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.minLength.path, parameters.object.minLength
@@ -2893,15 +3363,20 @@ export var NodeShape;
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), parameters.graph);
-        parameters.resource.add(PropertyShape.schema.properties.patterns.path, parameters.object.patterns.flatMap((item) => [
-            $literalFactory.string(item),
-        ]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.pattern.path, parameters.object.pattern
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.properties.path, parameters.object.properties.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.rdfType.path, parameters.object.rdfType.toList(), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.severity.path, parameters.object.severity.toList(), parameters.graph);
         parameters.resource.add(PropertyShape.schema.properties.shaclmateName.path, parameters.object.shaclmateName
             .toList()
             .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.subClassOf.path, parameters.object.subClassOf.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetClasses.path, parameters.object.targetClasses.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetNodes.path, parameters.object.targetNodes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetObjectsOf.path, parameters.object.targetObjectsOf.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(PropertyShape.schema.properties.targetSubjectsOf.path, parameters.object.targetSubjectsOf.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.toRdfTypes.path, parameters.object.toRdfTypes.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(NodeShape.schema.properties.tsImports.path, parameters.object.tsImports.flatMap((item) => [
             $literalFactory.string(item),
@@ -2995,7 +3470,7 @@ export var Shape;
     }
     Shape.isShape = isShape;
     Shape.schema = {
-        kind: "NamedObjectUnion",
+        kind: "ObjectUnion",
         members: {
             NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
             PropertyShape: {
@@ -3044,7 +3519,10 @@ export var Shape;
             flags: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
             },
             hasValues: {
                 kind: "Shacl",
@@ -3089,14 +3567,6 @@ export var Shape;
                     },
                 },
             },
-            maxCount: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt" },
-                },
-            },
             maxExclusive: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"),
@@ -3121,12 +3591,12 @@ export var Shape;
                     itemType: { kind: "BigInt" },
                 },
             },
-            minCount: {
+            message: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#message"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "BigInt" },
+                    itemType: { kind: "String" },
                 },
             },
             minExclusive: {
@@ -3206,10 +3676,28 @@ export var Shape;
                     },
                 },
             },
-            patterns: {
+            pattern: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
-                type: { kind: "Set", itemType: { kind: "String" } },
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
+            },
+            severity: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
+                type: {
+                    kind: "Option",
+                    itemType: {
+                        kind: "Iri",
+                        in: [
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Info"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Warning"),
+                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Violation"),
+                        ],
+                    },
+                },
             },
             shaclmateName: {
                 kind: "Shacl",
@@ -3219,6 +3707,26 @@ export var Shape;
                     itemType: { kind: "String" },
                 },
             },
+            targetClasses: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetNodes: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetNode"),
+                type: { kind: "Set", itemType: { kind: "Term" } },
+            },
+            targetObjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetObjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            targetSubjectsOf: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
             xone: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"),
@@ -3336,7 +3844,7 @@ export var $Object;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = $Object.Identifier || ($Object.Identifier = {}));
     $Object.schema = {
-        kind: "NamedObjectUnion",
+        kind: "ObjectUnion",
         members: {
             NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
             Ontology: { discriminantValues: ["Ontology"], type: Ontology.schema },