@shaclmate/shacl-ast 4.0.49 → 4.0.51

package/dist/{generated.js → shacl-ast.shaclmate.js}

@@ -190,6 +190,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 = {
@@ -424,327 +432,252 @@ 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)),
         }),
         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)),
         }),
         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)),
         }),
         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)),
         }),
         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),
         }),
         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)),
         }),
         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)),
         }),
         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)),
         }),
@@ -1063,10 +996,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
@@ -1276,39 +1210,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)),
         }),
@@ -1350,10 +1273,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()
@@ -1383,39 +1309,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)),
         }),
@@ -1457,10 +1372,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()
@@ -1534,435 +1452,336 @@ 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)),
         }),
         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)),
         }),
         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)),
         }),
         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)),
         }),
         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)),
         }),
         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)),
         }),
@@ -2364,10 +2183,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
@@ -2607,46 +2429,33 @@ export var ValidationReport;
         return ValidationReport.create(parameters).unsafeCoerce();
     }
     ValidationReport.createUnsafe = createUnsafe;
-    ValidationReport._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [ValidationReport.schema.fromRdfType], { graph: _$options.graph })
+    ValidationReport._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [ValidationReport.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: ValidationReport.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         conforms: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationReport.schema.properties.conforms,
             typeFromRdfResourceValues: ($booleanFromRdfResourceValues),
         }),
         results: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationReport.schema.properties.results,
             typeFromRdfResourceValues: $setFromRdfResourceValues(ValidationResult.fromRdfResourceValues),
         }),
         shapesGraphWellFormed: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationReport.schema.properties.shapesGraphWellFormed,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
@@ -2697,10 +2506,13 @@ export var ValidationReport;
                 },
             },
         },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationReport"),
+        ],
     };
     ValidationReport._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationReport"), parameters.graph);
+            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),
@@ -2744,91 +2556,68 @@ export var ValidationResult;
         return ValidationResult.create(parameters).unsafeCoerce();
     }
     ValidationResult.createUnsafe = createUnsafe;
-    ValidationResult._fromRdfResource = ($resource, _$options) => (!_$options.ignoreRdfType
-        ? $ensureRdfResourceType($resource, [ValidationResult.schema.fromRdfType], { graph: _$options.graph })
+    ValidationResult._fromRdfResource = (resource, options) => (!options.ignoreRdfType
+        ? $ensureRdfResourceType(resource, [ValidationResult.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: ValidationResult.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
         details: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.details,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         focusNode: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.focusNode,
             typeFromRdfResourceValues: ($termFromRdfResourceValues),
         }),
         message: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.message,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         path: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.path,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($PropertyPath.fromRdfResourceValues),
         }),
         severity: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.severity,
             typeFromRdfResourceValues: ($iriFromRdfResourceValues),
         }),
         sourceConstraintComponent: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.sourceConstraintComponent,
             typeFromRdfResourceValues: ($iriFromRdfResourceValues),
         }),
         sourceShape: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.sourceShape,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         value: $shaclPropertyFromRdf({
-            context: _$options.context,
-            graph: _$options.graph,
-            focusResource: $resource,
+            ...options,
+            focusResource: resource,
             ignoreRdfType: true,
-            preferredLanguages: _$options.preferredLanguages,
             propertySchema: ValidationResult.schema.properties.value,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
@@ -2931,10 +2720,13 @@ export var ValidationResult;
                 },
             },
         },
+        toRdfTypes: [
+            dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationResult"),
+        ],
     };
     ValidationResult._toRdfResource = (parameters) => {
         if (!parameters.ignoreRdfType) {
-            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationResult"), parameters.graph);
+            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);
@@ -3470,4 +3262,4 @@ export var $Object;
         throw new Error("unable to serialize to RDF");
     });
 })($Object || ($Object = {}));
-//# sourceMappingURL=generated.js.map
+//# sourceMappingURL=shacl-ast.shaclmate.js.map