@shaclmate/compiler 4.0.49 → 4.0.51

package/dist/input/{generated.js → input.shaclmate.js}

@@ -222,6 +222,14 @@ export var $PropertyPath;
     $PropertyPath.toRdfResource = RdfxResourcePropertyPath.toResource;
     $PropertyPath.$toString = RdfxResourcePropertyPath.toString;
 })($PropertyPath || ($PropertyPath = {}));
+function $rdfResourceIdentifierValues(resource) {
+    return new Resource.Value({
+        dataFactory: dataFactory,
+        focusResource: resource,
+        propertyPath: $RdfVocabularies.rdf.subject,
+        term: resource.identifier,
+    }).toValues();
+}
 var $RdfVocabularies;
 (function ($RdfVocabularies) {
     $RdfVocabularies.rdf = {
@@ -471,408 +479,315 @@ export var NodeShape;
         return NodeShape.create(parameters).unsafeCoerce();
     }
     NodeShape.createUnsafe = createUnsafe;
-    NodeShape._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [NodeShape.schema.fromRdfType], {
-            graph: _$options.graph,
+    NodeShape._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [NodeShape.schema.fromRdfType], {
+            graph: options.graph,
         })
         : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
-        $identifier: $identifierFromRdfResourceValues(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues(), {
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
-            preferredLanguages: _$options.preferredLanguages,
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
             propertyPath: $RdfVocabularies.rdf.subject,
             schema: NodeShape.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         and: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.and,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         classes: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.classes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         closed: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.closed,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         comment: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         datatype: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.datatype,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         deactivated: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.deactivated,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         discriminantValue: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.discriminantValue,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         extern: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.extern,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         flags: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.flags,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         fromRdfType: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.fromRdfType,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         hasValues: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.hasValues,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         ignore: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.ignore,
             typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         ignoredProperties: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.ignoredProperties,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($iriFromRdfResourceValues))),
         }),
         in_: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.in_,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($termFromRdfResourceValues))),
         }),
         isDefinedBy: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.isDefinedBy,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         label: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         languageIn: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.languageIn,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($stringFromRdfResourceValues))),
         }),
         maxExclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxInclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxLength: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         message: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.message,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         minExclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minInclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minLength: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         mutable: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.mutable,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         node: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.node,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         nodeKind: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.nodeKind,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         not: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.not,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         or: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.or,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         pattern: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.pattern,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         properties: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.properties,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         rdfType: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.rdfType,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         severity: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.severity,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         shaclmateName: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.shaclmateName,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         subClassOf: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.subClassOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetClasses: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetClasses,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetNodes: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetNodes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         targetObjectsOf: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetObjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetSubjectsOf: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetSubjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         toRdfTypes: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.toRdfTypes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         tsImports: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.tsImports,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         types: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.types,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         xone: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.xone,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
@@ -1173,16 +1088,20 @@ export var NodeShape;
             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"),
-                        ],
-                    },
+                get type() {
+                    return {
+                        kind: "Option",
+                        get itemType() {
+                            return {
+                                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: {
@@ -1248,10 +1167,11 @@ export var NodeShape;
                 },
             },
         },
+        toRdfTypes: [dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape")],
     };
     NodeShape._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"), parameters.graph);
+            parameters.resource.add($RdfVocabularies.rdf.type, NodeShape.schema.toRdfTypes, parameters.graph);
         }
         parameters.resource.add(NodeShape.schema.properties.and.path, parameters.object.and.toList().flatMap((value) => [
             value.length > 0
@@ -1491,39 +1411,28 @@ export var Ontology;
         return Ontology.create(parameters).unsafeCoerce();
     }
     Ontology.createUnsafe = createUnsafe;
-    Ontology._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [Ontology.schema.fromRdfType], {
-            graph: _$options.graph,
+    Ontology._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [Ontology.schema.fromRdfType], {
+            graph: options.graph,
         })
         : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
-        $identifier: $identifierFromRdfResourceValues(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues(), {
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
-            preferredLanguages: _$options.preferredLanguages,
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
             propertyPath: $RdfVocabularies.rdf.subject,
             schema: Ontology.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         comment: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         label: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
@@ -1565,10 +1474,13 @@ export var Ontology;
                 },
             },
         },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"),
+        ],
     };
     Ontology._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), parameters.graph);
+            parameters.resource.add($RdfVocabularies.rdf.type, Ontology.schema.toRdfTypes, parameters.graph);
         }
         parameters.resource.add(NodeShape.schema.properties.comment.path, parameters.object.comment
             .toList()
@@ -1598,39 +1510,28 @@ export var PropertyGroup;
         return PropertyGroup.create(parameters).unsafeCoerce();
     }
     PropertyGroup.createUnsafe = createUnsafe;
-    PropertyGroup._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [PropertyGroup.schema.fromRdfType], {
-            graph: _$options.graph,
+    PropertyGroup._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [PropertyGroup.schema.fromRdfType], {
+            graph: options.graph,
         })
         : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
-        $identifier: $identifierFromRdfResourceValues(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues(), {
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
-            preferredLanguages: _$options.preferredLanguages,
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
             propertyPath: $RdfVocabularies.rdf.subject,
             schema: PropertyGroup.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         comment: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         label: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
@@ -1672,10 +1573,13 @@ export var PropertyGroup;
                 },
             },
         },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"),
+        ],
     };
     PropertyGroup._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), parameters.graph);
+            parameters.resource.add($RdfVocabularies.rdf.type, PropertyGroup.schema.toRdfTypes, parameters.graph);
         }
         parameters.resource.add(NodeShape.schema.properties.comment.path, parameters.object.comment
             .toList()
@@ -1754,480 +1658,371 @@ export var PropertyShape;
         return PropertyShape.create(parameters).unsafeCoerce();
     }
     PropertyShape.createUnsafe = createUnsafe;
-    PropertyShape._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [PropertyShape.schema.fromRdfType], {
-            graph: _$options.graph,
+    PropertyShape._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [PropertyShape.schema.fromRdfType], {
+            graph: options.graph,
         })
         : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
-        $identifier: $identifierFromRdfResourceValues(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues(), {
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
-            preferredLanguages: _$options.preferredLanguages,
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
             propertyPath: $RdfVocabularies.rdf.subject,
             schema: PropertyShape.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         and: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.and,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         classes: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.classes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         comment: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         datatype: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.datatype,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         deactivated: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.deactivated,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         defaultValue: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.defaultValue,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         description: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.description,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         disjoint: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.disjoint,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         display: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.display,
             typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         equals: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.equals,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         flags: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.flags,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         groups: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.groups,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         hasValues: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.hasValues,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         ignore: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.ignore,
             typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         in_: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.in_,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($termFromRdfResourceValues))),
         }),
         isDefinedBy: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.isDefinedBy,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         label: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         languageIn: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.languageIn,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($stringFromRdfResourceValues))),
         }),
         lessThan: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.lessThan,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         lessThanOrEquals: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.lessThanOrEquals,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         maxCount: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.maxCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         maxExclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxInclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxLength: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.maxLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         message: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.message,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         minCount: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.minCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         minExclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minInclusive: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minLength: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.minLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         mutable: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.mutable,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         name: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.name,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         node: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.node,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         nodeKind: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.nodeKind,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         not: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.not,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         or: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.or,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         order: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.order,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($floatFromRdfResourceValues)),
         }),
         path: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.path,
             typeFromRdfResourceValues: $PropertyPath.fromRdfResourceValues,
         }),
         pattern: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.pattern,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         qualifiedMaxCount: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.qualifiedMaxCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         qualifiedMinCount: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.qualifiedMinCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         qualifiedValueShape: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.qualifiedValueShape,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         qualifiedValueShapesDisjoint: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.qualifiedValueShapesDisjoint,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         resolve: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.resolve,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         severity: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.severity,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         shaclmateName: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.shaclmateName,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         targetClasses: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetClasses,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetNodes: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetNodes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         targetObjectsOf: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetObjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetSubjectsOf: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.targetSubjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         uniqueLang: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: PropertyShape.schema.properties.uniqueLang,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         xone: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: NodeShape.schema.properties.xone,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
@@ -2604,16 +2399,20 @@ export var PropertyShape;
             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"),
-                        ],
-                    },
+                get type() {
+                    return {
+                        kind: "Option",
+                        get itemType() {
+                            return {
+                                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: {
@@ -2667,10 +2466,13 @@ export var PropertyShape;
                 },
             },
         },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"),
+        ],
     };
     PropertyShape._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"), parameters.graph);
+            parameters.resource.add($RdfVocabularies.rdf.type, PropertyShape.schema.toRdfTypes, parameters.graph);
         }
         parameters.resource.add(NodeShape.schema.properties.and.path, parameters.object.and.toList().flatMap((value) => [
             value.length > 0
@@ -2915,6 +2717,343 @@ export var PropertyShape;
             .extract(),
     });
 })(PropertyShape || (PropertyShape = {}));
+export var ValidationReport;
+(function (ValidationReport) {
+    ValidationReport.create = (parameters) => $sequenceRecord({
+        $identifier: $convertToIdentifierProperty(parameters.$identifier),
+        conforms: Either.of(parameters.conforms),
+        results: $convertToScalarSet($identityConversionFunction, true)(parameters.results).chain((value) => $validateArray($identityValidationFunction, true)(ValidationReport.schema.properties.results.type, value)),
+        shapesGraphWellFormed: $convertToMaybe($identityConversionFunction)(parameters.shapesGraphWellFormed).chain((value) => $validateMaybe($identityValidationFunction)(ValidationReport.schema.properties.shapesGraphWellFormed.type, value)),
+    })
+        .map((properties) => ({
+        ...properties,
+        $type: "ValidationReport",
+    }))
+        .map((object) => $monkeyPatchObject(object, { $toString: ValidationReport.$toString }));
+    function createUnsafe(parameters) {
+        return ValidationReport.create(parameters).unsafeCoerce();
+    }
+    ValidationReport.createUnsafe = createUnsafe;
+    ValidationReport._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [ValidationReport.schema.fromRdfType], { graph: options.graph })
+        : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
+            propertyPath: $RdfVocabularies.rdf.subject,
+            schema: ValidationReport.schema.properties.$identifier.type,
+        }).chain((values) => values.head()),
+        conforms: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationReport.schema.properties.conforms,
+            typeFromRdfResourceValues: ($booleanFromRdfResourceValues),
+        }),
+        results: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationReport.schema.properties.results,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(ValidationResult.fromRdfResourceValues),
+        }),
+        shapesGraphWellFormed: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationReport.schema.properties.shapesGraphWellFormed,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
+        }),
+    }).chain((properties) => ValidationReport.create(properties)));
+    ValidationReport.fromRdfResource = $wrap_FromRdfResourceFunction(ValidationReport._fromRdfResource);
+    ValidationReport.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => ValidationReport.fromRdfResource(resource, options)));
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = ValidationReport.Identifier || (ValidationReport.Identifier = {}));
+    function isValidationReport(object) {
+        return object.$type === "ValidationReport";
+    }
+    ValidationReport.isValidationReport = isValidationReport;
+    ValidationReport.schema = {
+        fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationReport"),
+        properties: {
+            $identifier: {
+                kind: "Identifier",
+                type: { kind: "Identifier" },
+            },
+            conforms: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#conforms"),
+                type: { kind: "Boolean" },
+            },
+            results: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#result"),
+                get type() {
+                    return {
+                        kind: "Set",
+                        get itemType() {
+                            return ValidationResult.schema;
+                        },
+                    };
+                },
+            },
+            shapesGraphWellFormed: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#shapesGraphWellFormed"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "Boolean" },
+                },
+            },
+        },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationReport"),
+        ],
+    };
+    ValidationReport._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, ValidationReport.schema.toRdfTypes, parameters.graph);
+        }
+        parameters.resource.add(ValidationReport.schema.properties.conforms.path, [
+            $literalFactory.boolean(parameters.object.conforms, $RdfVocabularies.xsd.boolean),
+        ], parameters.graph);
+        parameters.resource.add(ValidationReport.schema.properties.results.path, parameters.object.results.flatMap((item) => [
+            ValidationResult.toRdfResource(item, {
+                graph: parameters.graph,
+                resourceSet: parameters.resourceSet,
+            }).identifier,
+        ]), parameters.graph);
+        parameters.resource.add(ValidationReport.schema.properties.shapesGraphWellFormed.path, parameters.object.shapesGraphWellFormed
+            .toList()
+            .flatMap((value) => [
+            $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
+        ]), parameters.graph);
+        return parameters.resource;
+    };
+    ValidationReport.toRdfResource = $wrap_ToRdfResourceFunction(ValidationReport._toRdfResource);
+    ValidationReport.$toString = (_validationReport) => `ValidationReport(${JSON.stringify(ValidationReport.toStringRecord(_validationReport))})`;
+    ValidationReport.toStringRecord = (_validationReport) => $compactRecord({ $identifier: _validationReport.$identifier().toString() });
+})(ValidationReport || (ValidationReport = {}));
+export var ValidationResult;
+(function (ValidationResult) {
+    ValidationResult.create = (parameters) => $sequenceRecord({
+        $identifier: $convertToIdentifierProperty(parameters.$identifier),
+        details: $convertToScalarSet($identityConversionFunction, true)(parameters.details).chain((value) => $validateArray($identityValidationFunction, true)(ValidationResult.schema.properties.details.type, value)),
+        focusNode: Either.of(parameters.focusNode),
+        message: $convertToMaybe($identityConversionFunction)(parameters.message).chain((value) => $validateMaybe($identityValidationFunction)(ValidationResult.schema.properties.message.type, value)),
+        path: $convertToMaybe($identityConversionFunction)(parameters.path).chain((value) => $validateMaybe($identityValidationFunction)(ValidationResult.schema.properties.path.type, value)),
+        severity: $convertToIri(parameters.severity),
+        sourceConstraintComponent: $convertToIri(parameters.sourceConstraintComponent),
+        sourceShape: $convertToMaybe($convertToIdentifier)(parameters.sourceShape).chain((value) => $validateMaybe($identityValidationFunction)(ValidationResult.schema.properties.sourceShape.type, value)),
+        value: $convertToMaybe($identityConversionFunction)(parameters.value).chain((value) => $validateMaybe($identityValidationFunction)(ValidationResult.schema.properties.value.type, value)),
+    })
+        .map((properties) => ({
+        ...properties,
+        $type: "ValidationResult",
+    }))
+        .map((object) => $monkeyPatchObject(object, { $toString: ValidationResult.$toString }));
+    function createUnsafe(parameters) {
+        return ValidationResult.create(parameters).unsafeCoerce();
+    }
+    ValidationResult.createUnsafe = createUnsafe;
+    ValidationResult._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [ValidationResult.schema.fromRdfType], { graph: options.graph })
+        : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
+            propertyPath: $RdfVocabularies.rdf.subject,
+            schema: ValidationResult.schema.properties.$identifier.type,
+        }).chain((values) => values.head()),
+        details: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.details,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
+        }),
+        focusNode: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.focusNode,
+            typeFromRdfResourceValues: ($termFromRdfResourceValues),
+        }),
+        message: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.message,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
+        }),
+        path: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.path,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues($PropertyPath.fromRdfResourceValues),
+        }),
+        severity: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.severity,
+            typeFromRdfResourceValues: ($iriFromRdfResourceValues),
+        }),
+        sourceConstraintComponent: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.sourceConstraintComponent,
+            typeFromRdfResourceValues: ($iriFromRdfResourceValues),
+        }),
+        sourceShape: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.sourceShape,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
+        }),
+        value: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: ValidationResult.schema.properties.value,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($termFromRdfResourceValues)),
+        }),
+    }).chain((properties) => ValidationResult.create(properties)));
+    ValidationResult.fromRdfResource = $wrap_FromRdfResourceFunction(ValidationResult._fromRdfResource);
+    ValidationResult.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => ValidationResult.fromRdfResource(resource, options)));
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = ValidationResult.Identifier || (ValidationResult.Identifier = {}));
+    function isValidationResult(object) {
+        return object.$type === "ValidationResult";
+    }
+    ValidationResult.isValidationResult = isValidationResult;
+    ValidationResult.schema = {
+        fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationResult"),
+        properties: {
+            $identifier: {
+                kind: "Identifier",
+                type: { kind: "Identifier" },
+            },
+            details: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#detail"),
+                type: {
+                    kind: "Set",
+                    itemType: {
+                        kind: "Term",
+                        types: ["BlankNode", "NamedNode", "Literal"],
+                    },
+                },
+            },
+            focusNode: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#focusNode"),
+                type: {
+                    kind: "Term",
+                    types: ["BlankNode", "NamedNode", "Literal"],
+                },
+            },
+            message: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#resultMessage"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String" },
+                },
+            },
+            path: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#resultPath"),
+                get type() {
+                    return {
+                        kind: "Option",
+                        get itemType() {
+                            return $PropertyPath.schema;
+                        },
+                    };
+                },
+            },
+            severity: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#resultSeverity"),
+                get type() {
+                    return {
+                        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"),
+                        ],
+                    };
+                },
+            },
+            sourceConstraintComponent: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#sourceConstraintComponent"),
+                type: { kind: "Iri" },
+            },
+            sourceShape: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#sourceShape"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "Identifier" },
+                },
+            },
+            value: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#value"),
+                type: {
+                    kind: "Option",
+                    itemType: {
+                        kind: "Term",
+                        types: ["BlankNode", "NamedNode", "Literal"],
+                    },
+                },
+            },
+        },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationResult"),
+        ],
+    };
+    ValidationResult._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, ValidationResult.schema.toRdfTypes, parameters.graph);
+        }
+        parameters.resource.add(ValidationResult.schema.properties.details.path, parameters.object.details.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.focusNode.path, [parameters.object.focusNode], parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.message.path, parameters.object.message
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.path.path, parameters.object.path.toList().flatMap((value) => [
+            $PropertyPath.toRdfResource(value, {
+                graph: parameters.graph,
+                resourceSet: parameters.resourceSet,
+            }).identifier,
+        ]), parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.severity.path, [parameters.object.severity], parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.sourceConstraintComponent.path, [parameters.object.sourceConstraintComponent], parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.sourceShape.path, parameters.object.sourceShape.toList(), parameters.graph);
+        parameters.resource.add(ValidationResult.schema.properties.value.path, parameters.object.value.toList(), parameters.graph);
+        return parameters.resource;
+    };
+    ValidationResult.toRdfResource = $wrap_ToRdfResourceFunction(ValidationResult._toRdfResource);
+    ValidationResult.$toString = (_validationResult) => `ValidationResult(${JSON.stringify(ValidationResult.toStringRecord(_validationResult))})`;
+    ValidationResult.toStringRecord = (_validationResult) => $compactRecord({ $identifier: _validationResult.$identifier().toString() });
+})(ValidationResult || (ValidationResult = {}));
 export var Shape;
 (function (Shape) {
     Shape.$toString = (value) => {
@@ -3187,16 +3326,20 @@ export var Shape;
             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"),
-                        ],
-                    },
+                get type() {
+                    return {
+                        kind: "Option",
+                        get itemType() {
+                            return {
+                                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: {
@@ -3287,6 +3430,12 @@ export var $Object;
         if (PropertyShape.isPropertyShape(value)) {
             return PropertyShape.$toString(value);
         }
+        if (ValidationReport.isValidationReport(value)) {
+            return ValidationReport.$toString(value);
+        }
+        if (ValidationResult.isValidationResult(value)) {
+            return ValidationResult.$toString(value);
+        }
         throw new Error("unable to serialize to string");
     };
     $Object.fromRdfResource = (resource, options) => NodeShape.fromRdfResource(resource, {
@@ -3304,6 +3453,14 @@ export var $Object;
         .altLazy(() => PropertyShape.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
+    }))
+        .altLazy(() => ValidationReport.fromRdfResource(resource, {
+        ...options,
+        ignoreRdfType: false,
+    }))
+        .altLazy(() => ValidationResult.fromRdfResource(resource, {
+        ...options,
+        ignoreRdfType: false,
     }));
     $Object.fromRdfResourceValues = ((values, options) => values.chainMap((value) => {
         const valueAsValues = value.toValues();
@@ -3322,6 +3479,14 @@ export var $Object;
             .altLazy(() => PropertyShape.fromRdfResourceValues(valueAsValues, {
             ...options,
             schema: options.schema.members["PropertyShape"].type,
+        }))
+            .altLazy(() => ValidationReport.fromRdfResourceValues(valueAsValues, {
+            ...options,
+            schema: options.schema.members["ValidationReport"].type,
+        }))
+            .altLazy(() => ValidationResult.fromRdfResourceValues(valueAsValues, {
+            ...options,
+            schema: options.schema.members["ValidationResult"].type,
         }))
             .chain((values) => values.head());
     }));
@@ -3343,25 +3508,16 @@ export var $Object;
                 discriminantValues: ["PropertyShape"],
                 type: PropertyShape.schema,
             },
-        },
-        properties: {
-            comment: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String" },
-                },
+            ValidationReport: {
+                discriminantValues: ["ValidationReport"],
+                type: ValidationReport.schema,
             },
-            label: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String" },
-                },
+            ValidationResult: {
+                discriminantValues: ["ValidationResult"],
+                type: ValidationResult.schema,
             },
         },
+        properties: {},
     };
     $Object.toRdfResource = (object, options) => {
         if (NodeShape.isNodeShape(object)) {
@@ -3376,6 +3532,12 @@ export var $Object;
         if (PropertyShape.isPropertyShape(object)) {
             return PropertyShape.toRdfResource(object, options);
         }
+        if (ValidationReport.isValidationReport(object)) {
+            return ValidationReport.toRdfResource(object, options);
+        }
+        if (ValidationResult.isValidationResult(object)) {
+            return ValidationResult.toRdfResource(object, options);
+        }
         throw new Error("unrecognized type");
     };
     $Object.toRdfResourceValues = ((value, _options) => {
@@ -3411,7 +3573,23 @@ export var $Object;
                 }).identifier,
             ];
         }
+        if (ValidationReport.isValidationReport(value)) {
+            return [
+                ValidationReport.toRdfResource(value, {
+                    graph: _options.graph,
+                    resourceSet: _options.resourceSet,
+                }).identifier,
+            ];
+        }
+        if (ValidationResult.isValidationResult(value)) {
+            return [
+                ValidationResult.toRdfResource(value, {
+                    graph: _options.graph,
+                    resourceSet: _options.resourceSet,
+                }).identifier,
+            ];
+        }
         throw new Error("unable to serialize to RDF");
     });
 })($Object || ($Object = {}));
-//# sourceMappingURL=generated.js.map
+//# sourceMappingURL=input.shaclmate.js.map