npm - @shaclmate/compiler - Versions diffs - 4.0.30 → 4.0.32 - Mend

@shaclmate/compiler 4.0.30 → 4.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/dist/input/generated.js CHANGED Viewed

@@ -255,6 +255,17 @@ var $RdfVocabularies;
         xsd.unsignedShort = dataFactory.namedNode("http://www.w3.org/2001/XMLSchema#unsignedShort");
     })(xsd = $RdfVocabularies.xsd || ($RdfVocabularies.xsd = {}));
 })($RdfVocabularies || ($RdfVocabularies = {}));
+function $sequenceRecord(record) {
+    const result = {};
+    for (const key of globalThis.Object.keys(record)) {
+        const either = record[key];
+        if (either.isLeft()) {
+            return either;
+        }
+        result[key] = either.extract();
+    }
+    return Right(result);
+}
 function $shaclPropertyFromRdf({ graph, propertySchema, resource, typeFromRdf, }) {
     return typeFromRdf(Right(resource.values(propertySchema.path, { graph, unique: true }))).chain((values) => values.head());
 }
@@ -264,6 +275,41 @@ function $shaclPropertyFromRdf({ graph, propertySchema, resource, typeFromRdf, }
 function $strictEquals(left, right) {
     return $EqualsResult.fromBooleanEqualsResult(left, right, left === right);
 }
+function $wrap_FromRdfResourceFunction(_fromRdfResourceFunction) {
+    return (resource, options) => {
+        let { context, graph, ignoreRdfType = false, objectSet, preferredLanguages, } = options ?? {};
+        if (!objectSet) {
+            objectSet = new $RdfjsDatasetObjectSet(resource.dataset);
+        }
+        return _fromRdfResourceFunction(resource, {
+            context,
+            graph,
+            ignoreRdfType,
+            objectSet,
+            preferredLanguages,
+        });
+    };
+}
+function $wrap_ToRdfResourceFunction(_toRdfResourceFunction) {
+    return (object, options) => {
+        let { graph, ignoreRdfType = false, resourceSet } = options ?? {};
+        if (!resourceSet) {
+            resourceSet = new ResourceSet({
+                dataFactory: dataFactory,
+                dataset: datasetFactory.dataset(),
+            });
+        }
+        const resource = resourceSet.resource(object.$identifier());
+        _toRdfResourceFunction({
+            graph,
+            ignoreRdfType,
+            object,
+            resource,
+            resourceSet,
+        });
+        return resource;
+    };
+}
 export var PropertyShape;
 (function (PropertyShape) {
     function create(parameters) {
@@ -1069,33 +1115,7 @@ export var PropertyShape;
         return true;
     }
     PropertyShape.filter = filter;
-    PropertyShape.fromRdfResource = (resource, options) => {
-        let { context, graph, ignoreRdfType = false, objectSet, preferredLanguages, } = options ?? {};
-        if (!objectSet) {
-            objectSet = new $RdfjsDatasetObjectSet(resource.dataset);
-        }
-        return PropertyShape.propertiesFromRdfResource(resource, {
-            context,
-            graph,
-            ignoreRdfType,
-            objectSet,
-            preferredLanguages,
-        }).map(create);
-    };
-    PropertyShape.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
-        .toResource()
-        .chain((resource) => PropertyShape.fromRdfResource(resource, options))));
-    PropertyShape.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape");
-    function isPropertyShape(object) {
-        switch (object.$type) {
-            case "PropertyShape":
-                return true;
-            default:
-                return false;
-        }
-    }
-    PropertyShape.isPropertyShape = isPropertyShape;
-    PropertyShape.propertiesFromRdfResource = ($resource, _$options) => {
+    PropertyShape._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -1114,768 +1134,619 @@ export var PropertyShape;
                 }
                 return Left(new Error(`${$resource.identifier} has unexpected RDF type (actual: ${actualRdfType.value}, expected: http://www.w3.org/ns/shacl#PropertyShape)`));
             })
-            : Right(true)).chain((_rdfTypeCheck) => Right(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues())
-            .chain((values) => values.chainMap((value) => value.toIdentifier()))
-            .chain((values) => values.head())
-            .chain(($identifier) => Right("PropertyShape").chain(($type) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.and,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.and.path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.and.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((and) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.classes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.classes.path,
-                value: valuesArray,
-            })),
-        }).chain((classes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.comment,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.comment.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((comment) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.datatype,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.datatype.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((datatype) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.deactivated,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.deactivated
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((deactivated) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.defaultValue,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
-                switch (term.termType) {
-                    case "NamedNode":
-                    case "Literal":
-                        return Either.of(term);
-                    default:
-                        return Left(new Resource.MistypedTermValueError({
-                            actualValue: term,
-                            expectedValueType: "(NamedNode | Literal)",
-                            focusResource: $resource,
-                            propertyPath: PropertyShape.schema.properties
-                                .defaultValue.path,
-                        }));
-                }
-            })))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties
-                        .defaultValue.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((defaultValue) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.description,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties
-                        .description.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((description) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.display,
-            typeFromRdf: (resourceValues) => resourceValues
-                .map((values) => values.length > 0
-                ? values
-                : new Resource.Value({
-                    dataFactory: dataFactory,
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties
-                        .display.path,
-                    term: dataFactory.literal("false", $RdfVocabularies.xsd.boolean),
-                }).toValues())
-                .chain((values) => values.chainMap((value) => value.toBoolean())),
-        }).chain((display) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.flags,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
+            : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+            $identifier: Right(new Resource.Value({
+                dataFactory: dataFactory,
                 focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.flags
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((flags) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.groups,
-            typeFromRdf: (resourceValues) => resourceValues
+                propertyPath: $RdfVocabularies.rdf.subject,
+                term: $resource.identifier,
+            }).toValues())
                 .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.groups
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((groups) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.hasValues,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
-                switch (term.termType) {
-                    case "NamedNode":
-                    case "Literal":
-                        return Either.of(term);
-                    default:
-                        return Left(new Resource.MistypedTermValueError({
-                            actualValue: term,
-                            expectedValueType: "(NamedNode | Literal)",
-                            focusResource: $resource,
-                            propertyPath: PropertyShape.schema
-                                .properties.hasValues
-                                .path,
-                        }));
-                }
-            })))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties
-                    .hasValues.path,
-                value: valuesArray,
-            })),
-        }).chain((hasValues) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.in_,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+                .chain((values) => values.head()),
+            and: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema
-                    .properties.in_.path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
-                switch (term.termType) {
-                    case "NamedNode":
-                    case "Literal":
-                        return Either.of(term);
-                    default:
-                        return Left(new Resource.MistypedTermValueError({
-                            actualValue: term,
-                            expectedValueType: "(NamedNode | Literal)",
-                            focusResource: $resource,
-                            propertyPath: PropertyShape
-                                .schema
-                                .properties.in_
-                                .path,
-                        }));
-                }
-            })))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.in_.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((in_) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.isDefinedBy,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.isDefinedBy
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((isDefinedBy) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.label,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.and,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.label.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((label) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.languageIn,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+                    propertyPath: PropertyShape.schema.properties.and.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.and.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            classes: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema
-                    .properties
-                    .languageIn.path,
-                values: valueList.toArray(),
-            }))
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.languageIn
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((languageIn) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.maxCount,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.maxCount
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxCount) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.maxExclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties
-                        .maxExclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxExclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties
-                .maxInclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .maxInclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxInclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties.maxLength,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .maxLength
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxLength) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties
-                .minCount,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minCount
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((minCount) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties
-                .minExclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minExclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((minExclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties
-                .minInclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minInclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((minInclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema.properties
-                .minLength,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minLength
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((minLength) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .mutable,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.classes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .mutable
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.classes.path,
+                    value: valuesArray,
                 })),
-        }).chain((mutable) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .name,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            comment: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.comment,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.comment.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            datatype: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.datatype,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.datatype.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            deactivated: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.deactivated,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.deactivated.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            defaultValue: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.defaultValue,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.defaultValue.path,
+                            }));
+                    }
+                })))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.defaultValue.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            description: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.description,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.description.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            display: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.display,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .map((values) => values.length > 0
+                    ? values
+                    : new Resource.Value({
+                        dataFactory: dataFactory,
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.display.path,
+                        term: dataFactory.literal("false", $RdfVocabularies.xsd.boolean),
+                    }).toValues())
+                    .chain((values) => values.chainMap((value) => value.toBoolean())),
+            }),
+            flags: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.flags,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .name
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.flags.path,
+                    value: valuesArray,
                 })),
-        }).chain((name) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .node,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            groups: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.groups,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .node
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.groups.path,
+                    value: valuesArray,
                 })),
-        }).chain((node) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .nodeKind,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
-            ])))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            hasValues: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.hasValues,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.hasValues.path,
+                            }));
+                    }
+                })))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .nodeKind
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.hasValues.path,
+                    value: valuesArray,
                 })),
-        }).chain((nodeKind) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .not,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .not
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((not) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .or,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+            }),
+            in_: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .or
-                    .path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.in_,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .or
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((or) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .order,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toFloat()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: PropertyShape.schema.properties.in_.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.in_.path,
+                            }));
+                    }
+                })))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.in_.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            isDefinedBy: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.isDefinedBy,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.isDefinedBy.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            label: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.label,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.label.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            languageIn: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.languageIn,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .order
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((order) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .path,
-            typeFromRdf: (resourceValues) => $PropertyPath.fromRdfResourceValues(resourceValues, {
-                context: _$options.context,
+                    propertyPath: PropertyShape.schema.properties.languageIn.path,
+                    values: valueList.toArray(),
+                }))
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.languageIn.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxCount: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-                preferredLanguages: _$options.preferredLanguages,
-                objectSet: _$options.objectSet,
                 resource: $resource,
-                ignoreRdfType: true,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .path
-                    .path,
+                propertySchema: PropertyShape.schema.properties.maxCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxCount.path,
+                        value: Maybe.empty(),
+                    })),
             }),
-        }).chain((path) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .patterns,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .patterns
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((patterns) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .resolve,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            maxExclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.maxExclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxExclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxInclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.maxInclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxInclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxLength: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.maxLength,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxLength.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minCount: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.minCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minCount.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minExclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.minExclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minExclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minInclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.minInclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minInclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minLength: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.minLength,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minLength.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            mutable: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.mutable,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.mutable.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            name: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.name,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.name.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            node: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.node,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.node.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            nodeKind: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.nodeKind,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
+                ])))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.nodeKind.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            not: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.not,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .resolve
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.not.path,
+                    value: valuesArray,
                 })),
-        }).chain((resolve) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .shaclmateName,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            or: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.or,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .shaclmateName
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((shaclmateName) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .uniqueLang,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: PropertyShape.schema.properties.or.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.or.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            order: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.order,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toFloat()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.order.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            path: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.path,
+                typeFromRdf: (resourceValues) => $PropertyPath.fromRdfResourceValues(resourceValues, {
+                    context: _$options.context,
+                    graph: _$options.graph,
+                    objectSet: _$options.objectSet,
+                    preferredLanguages: _$options.preferredLanguages,
+                    resource: $resource,
+                    ignoreRdfType: true,
+                    propertyPath: PropertyShape.schema.properties.path.path,
+                }),
+            }),
+            patterns: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.patterns,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .uniqueLang
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.patterns.path,
+                    value: valuesArray,
                 })),
-        }).chain((uniqueLang) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.schema
-                .properties
-                .xone,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+            }),
+            resolve: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .xone
-                    .path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.resolve,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.resolve.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            shaclmateName: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.shaclmateName,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.shaclmateName.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            uniqueLang: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.uniqueLang,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.uniqueLang.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            xone: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyShape.schema.properties.xone,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .xone
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).map((xone) => ({
-            $identifier,
-            $type,
-            and,
-            classes,
-            comment,
-            datatype,
-            deactivated,
-            defaultValue,
-            description,
-            display,
-            flags,
-            groups,
-            hasValues,
-            in_,
-            isDefinedBy,
-            label,
-            languageIn,
-            maxCount,
-            maxExclusive,
-            maxInclusive,
-            maxLength,
-            minCount,
-            minExclusive,
-            minInclusive,
-            minLength,
-            mutable,
-            name,
-            node,
-            nodeKind,
-            not,
-            or,
-            order,
-            path,
-            patterns,
-            resolve,
-            shaclmateName,
-            uniqueLang,
-            xone,
-        }))))))))))))))))))))))))))))))))))))))));
+                    propertyPath: PropertyShape.schema.properties.xone.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.xone.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+        }).map((properties) => create(properties)));
     };
+    PropertyShape.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyShape._fromRdfResource);
+    PropertyShape.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => PropertyShape.fromRdfResource(resource, options))));
+    PropertyShape.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape");
+    function isPropertyShape(object) {
+        switch (object.$type) {
+            case "PropertyShape":
+                return true;
+            default:
+                return false;
+        }
+    }
+    PropertyShape.isPropertyShape = isPropertyShape;
     PropertyShape.schema = {
         properties: {
             $identifier: {
@@ -2202,212 +2073,208 @@ export var PropertyShape;
             },
         },
     };
-    function toRdfResource(_propertyShape, options) {
-        const resourceSet = options?.resourceSet ??
-            new ResourceSet({
-                dataFactory: dataFactory,
-                dataset: datasetFactory.dataset(),
-            });
-        const resource = resourceSet.resource(_propertyShape.$identifier());
-        if (!options?.ignoreRdfType) {
-            resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"), options?.graph);
+    PropertyShape._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"), parameters.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#and"), _propertyShape.and.toList().flatMap((value) => [
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#and"), parameters.object.and.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#class"), _propertyShape.classes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyShape.comment
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#class"), parameters.object.classes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), parameters.object.comment
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), _propertyShape.datatype.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), _propertyShape.deactivated
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), parameters.object.datatype.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), parameters.object.deactivated
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#defaultValue"), _propertyShape.defaultValue.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#description"), _propertyShape.description
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#defaultValue"), parameters.object.defaultValue.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#description"), parameters.object.description
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#display"), $strictEquals(_propertyShape.display, false).isLeft()
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#display"), $strictEquals(parameters.object.display, false).isLeft()
             ? [
-                $literalFactory.boolean(_propertyShape.display, $RdfVocabularies.xsd.boolean),
+                $literalFactory.boolean(parameters.object.display, $RdfVocabularies.xsd.boolean),
             ]
-            : [], options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), _propertyShape.flags.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#group"), _propertyShape.groups.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), _propertyShape.hasValues.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#in"), _propertyShape.in_.toList().flatMap((value) => [
+            : [], parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), parameters.object.flags.flatMap((item) => [$literalFactory.string(item)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#group"), parameters.object.groups.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), parameters.object.hasValues.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#in"), parameters.object.in_.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), _propertyShape.isDefinedBy.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyShape.label
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), parameters.object.isDefinedBy.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), parameters.object.label
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), _propertyShape.languageIn.toList().flatMap((value) => [
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), parameters.object.languageIn.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [$literalFactory.string(item)], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [$literalFactory.string(item)], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"), _propertyShape.maxCount
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"), parameters.object.maxCount
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"), _propertyShape.maxExclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"), _propertyShape.maxInclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"), _propertyShape.maxLength
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"), parameters.object.maxExclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"), parameters.object.maxInclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"), parameters.object.maxLength
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"), _propertyShape.minCount
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"), parameters.object.minCount
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"), _propertyShape.minExclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"), _propertyShape.minInclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"), _propertyShape.minLength
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"), parameters.object.minExclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"), parameters.object.minInclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"), parameters.object.minLength
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"), _propertyShape.mutable
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"), parameters.object.mutable
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#name"), _propertyShape.name
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#name"), parameters.object.name
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), _propertyShape.node.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), _propertyShape.nodeKind.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), _propertyShape.not.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#or"), _propertyShape.or.toList().flatMap((value) => [
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), parameters.object.node.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), parameters.object.nodeKind.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), parameters.object.not.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#or"), parameters.object.or.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#order"), _propertyShape.order
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#order"), parameters.object.order
             .toList()
             .flatMap((value) => [
             $literalFactory.number(value, $RdfVocabularies.xsd.double),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#path"), [
-            $PropertyPath.toRdfResource(_propertyShape.path, {
-                graph: options?.graph,
-                resourceSet: resourceSet,
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#path"), [
+            $PropertyPath.toRdfResource(parameters.object.path, {
+                graph: parameters.graph,
+                resourceSet: parameters.resourceSet,
             }).identifier,
-        ], options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), _propertyShape.patterns.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"), _propertyShape.resolve.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _propertyShape.shaclmateName
+        ], parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), parameters.object.patterns.flatMap((item) => [
+            $literalFactory.string(item),
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"), parameters.object.resolve.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), parameters.object.shaclmateName
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"), _propertyShape.uniqueLang
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"), parameters.object.uniqueLang
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), _propertyShape.xone.toList().flatMap((value) => [
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), parameters.object.xone.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        return resource;
-    }
-    PropertyShape.toRdfResource = toRdfResource;
-    function propertiesToStrings(_propertyShape) {
+        ]), parameters.graph);
+        return parameters.resource;
+    };
+    PropertyShape.toRdfResource = $wrap_ToRdfResourceFunction(PropertyShape._toRdfResource);
+    function _propertiesToStrings(_propertyShape) {
         return $compactRecord({
             $identifier: _propertyShape.$identifier().toString(),
             label: _propertyShape.label.map((item) => item.toString()).extract(),
@@ -2418,9 +2285,9 @@ export var PropertyShape;
                 .extract(),
         });
     }
-    PropertyShape.propertiesToStrings = propertiesToStrings;
+    PropertyShape._propertiesToStrings = _propertiesToStrings;
     function $toString(_propertyShape) {
-        return `PropertyShape(${JSON.stringify(propertiesToStrings((_propertyShape ?? this)))})`;
+        return `PropertyShape(${JSON.stringify(_propertiesToStrings((_propertyShape ?? this)))})`;
     }
     PropertyShape.$toString = $toString;
 })(PropertyShape || (PropertyShape = {}));
@@ -2496,33 +2363,7 @@ export var PropertyGroup;
         return true;
     }
     PropertyGroup.filter = filter;
-    PropertyGroup.fromRdfResource = (resource, options) => {
-        let { context, graph, ignoreRdfType = false, objectSet, preferredLanguages, } = options ?? {};
-        if (!objectSet) {
-            objectSet = new $RdfjsDatasetObjectSet(resource.dataset);
-        }
-        return PropertyGroup.propertiesFromRdfResource(resource, {
-            context,
-            graph,
-            ignoreRdfType,
-            objectSet,
-            preferredLanguages,
-        }).map(create);
-    };
-    PropertyGroup.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
-        .toResource()
-        .chain((resource) => PropertyGroup.fromRdfResource(resource, options))));
-    PropertyGroup.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup");
-    function isPropertyGroup(object) {
-        switch (object.$type) {
-            case "PropertyGroup":
-                return true;
-            default:
-                return false;
-        }
-    }
-    PropertyGroup.isPropertyGroup = isPropertyGroup;
-    PropertyGroup.propertiesFromRdfResource = ($resource, _$options) => {
+    PropertyGroup._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -2541,44 +2382,61 @@ export var PropertyGroup;
                 }
                 return Left(new Error(`${$resource.identifier} has unexpected RDF type (actual: ${actualRdfType.value}, expected: http://www.w3.org/ns/shacl#PropertyGroup)`));
             })
-            : Right(true)).chain((_rdfTypeCheck) => Right(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues())
-            .chain((values) => values.chainMap((value) => value.toIdentifier()))
-            .chain((values) => values.head())
-            .chain(($identifier) => Right("PropertyGroup").chain(($type) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyGroup.schema.properties.comment,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.comment.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((comment) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyGroup.schema.properties.label,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.label.path,
-                    value: Maybe.empty(),
-                })),
-        }).map((label) => ({ $identifier, $type, comment, label }))))));
+            : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+            $identifier: Right(new Resource.Value({
+                dataFactory: dataFactory,
+                focusResource: $resource,
+                propertyPath: $RdfVocabularies.rdf.subject,
+                term: $resource.identifier,
+            }).toValues())
+                .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                .chain((values) => values.head()),
+            comment: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyGroup.schema.properties.comment,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.comment.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            label: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: PropertyGroup.schema.properties.label,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.label.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+        }).map((properties) => create(properties)));
     };
+    PropertyGroup.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyGroup._fromRdfResource);
+    PropertyGroup.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => PropertyGroup.fromRdfResource(resource, options))));
+    PropertyGroup.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup");
+    function isPropertyGroup(object) {
+        switch (object.$type) {
+            case "PropertyGroup":
+                return true;
+            default:
+                return false;
+        }
+    }
+    PropertyGroup.isPropertyGroup = isPropertyGroup;
     PropertyGroup.schema = {
         properties: {
             $identifier: {
@@ -2610,34 +2468,28 @@ export var PropertyGroup;
             },
         },
     };
-    function toRdfResource(_propertyGroup, options) {
-        const resourceSet = options?.resourceSet ??
-            new ResourceSet({
-                dataFactory: dataFactory,
-                dataset: datasetFactory.dataset(),
-            });
-        const resource = resourceSet.resource(_propertyGroup.$identifier());
-        if (!options?.ignoreRdfType) {
-            resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), options?.graph);
+    PropertyGroup._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), parameters.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyGroup.comment
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), parameters.object.comment
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyGroup.label
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), parameters.object.label
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        return resource;
-    }
-    PropertyGroup.toRdfResource = toRdfResource;
-    function propertiesToStrings(_propertyGroup) {
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        return parameters.resource;
+    };
+    PropertyGroup.toRdfResource = $wrap_ToRdfResourceFunction(PropertyGroup._toRdfResource);
+    function _propertiesToStrings(_propertyGroup) {
         return $compactRecord({
             $identifier: _propertyGroup.$identifier().toString(),
             label: _propertyGroup.label.map((item) => item.toString()).extract(),
         });
     }
-    PropertyGroup.propertiesToStrings = propertiesToStrings;
+    PropertyGroup._propertiesToStrings = _propertiesToStrings;
     function $toString(_propertyGroup) {
-        return `PropertyGroup(${JSON.stringify(propertiesToStrings((_propertyGroup ?? this)))})`;
+        return `PropertyGroup(${JSON.stringify(_propertiesToStrings((_propertyGroup ?? this)))})`;
     }
     PropertyGroup.$toString = $toString;
 })(PropertyGroup || (PropertyGroup = {}));
@@ -2769,33 +2621,7 @@ export var Ontology;
         return true;
     }
     Ontology.filter = filter;
-    Ontology.fromRdfResource = (resource, options) => {
-        let { context, graph, ignoreRdfType = false, objectSet, preferredLanguages, } = options ?? {};
-        if (!objectSet) {
-            objectSet = new $RdfjsDatasetObjectSet(resource.dataset);
-        }
-        return Ontology.propertiesFromRdfResource(resource, {
-            context,
-            graph,
-            ignoreRdfType,
-            objectSet,
-            preferredLanguages,
-        }).map(create);
-    };
-    Ontology.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
-        .toResource()
-        .chain((resource) => Ontology.fromRdfResource(resource, options))));
-    Ontology.fromRdfType = dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology");
-    function isOntology(object) {
-        switch (object.$type) {
-            case "Ontology":
-                return true;
-            default:
-                return false;
-        }
-    }
-    Ontology.isOntology = isOntology;
-    Ontology.propertiesFromRdfResource = ($resource, _$options) => {
+    Ontology._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -2814,111 +2640,123 @@ export var Ontology;
                 }
                 return Left(new Error(`${$resource.identifier} has unexpected RDF type (actual: ${actualRdfType.value}, expected: http://www.w3.org/2002/07/owl#Ontology)`));
             })
-            : Right(true)).chain((_rdfTypeCheck) => Right(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues())
-            .chain((values) => values.chainMap((value) => value.toIdentifier()))
-            .chain((values) => values.head())
-            .chain(($identifier) => Right("Ontology").chain(($type) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.schema.properties.comment,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+            $identifier: Right(new Resource.Value({
+                dataFactory: dataFactory,
+                focusResource: $resource,
+                propertyPath: $RdfVocabularies.rdf.subject,
+                term: $resource.identifier,
+            }).toValues())
+                .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                .chain((values) => values.head()),
+            comment: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: Ontology.schema.properties.comment,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.comment.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            label: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: Ontology.schema.properties.label,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.label.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            tsFeatureExcludes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: Ontology.schema.properties.tsFeatureExcludes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
+                ])))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.comment.path,
-                    value: Maybe.empty(),
+                    propertyPath: Ontology.schema.properties.tsFeatureExcludes.path,
+                    value: valuesArray,
                 })),
-        }).chain((comment) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.schema.properties.label,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            tsFeatureIncludes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: Ontology.schema.properties.tsFeatureIncludes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
+                ])))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.label.path,
-                    value: Maybe.empty(),
+                    propertyPath: Ontology.schema.properties.tsFeatureIncludes.path,
+                    value: valuesArray,
                 })),
-        }).chain((label) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.schema.properties.tsFeatureExcludes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
-            ])))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology.schema.properties.tsFeatureExcludes.path,
-                value: valuesArray,
-            })),
-        }).chain((tsFeatureExcludes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.schema.properties.tsFeatureIncludes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
-            ])))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology.schema.properties.tsFeatureIncludes.path,
-                value: valuesArray,
-            })),
-        }).chain((tsFeatureIncludes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.schema.properties.tsImports,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology.schema.properties.tsImports.path,
-                value: valuesArray,
-            })),
-        }).map((tsImports) => ({
-            $identifier,
-            $type,
-            comment,
-            label,
-            tsFeatureExcludes,
-            tsFeatureIncludes,
-            tsImports,
-        })))))))));
+            }),
+            tsImports: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: Ontology.schema.properties.tsImports,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: Ontology.schema.properties.tsImports.path,
+                    value: valuesArray,
+                })),
+            }),
+        }).map((properties) => create(properties)));
     };
+    Ontology.fromRdfResource = $wrap_FromRdfResourceFunction(Ontology._fromRdfResource);
+    Ontology.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => Ontology.fromRdfResource(resource, options))));
+    Ontology.fromRdfType = dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology");
+    function isOntology(object) {
+        switch (object.$type) {
+            case "Ontology":
+                return true;
+            default:
+                return false;
+        }
+    }
+    Ontology.isOntology = isOntology;
     Ontology.schema = {
         properties: {
             $identifier: {
@@ -3002,37 +2840,33 @@ export var Ontology;
             },
         },
     };
-    function toRdfResource(_ontology, options) {
-        const resourceSet = options?.resourceSet ??
-            new ResourceSet({
-                dataFactory: dataFactory,
-                dataset: datasetFactory.dataset(),
-            });
-        const resource = resourceSet.resource(_ontology.$identifier());
-        if (!options?.ignoreRdfType) {
-            resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), options?.graph);
+    Ontology._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), parameters.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _ontology.comment
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), parameters.object.comment
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _ontology.label
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), parameters.object.label
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), _ontology.tsFeatureExcludes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), _ontology.tsFeatureIncludes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), _ontology.tsImports.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        return resource;
-    }
-    Ontology.toRdfResource = toRdfResource;
-    function propertiesToStrings(_ontology) {
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), parameters.object.tsFeatureExcludes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), parameters.object.tsFeatureIncludes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), parameters.object.tsImports.flatMap((item) => [
+            $literalFactory.string(item),
+        ]), parameters.graph);
+        return parameters.resource;
+    };
+    Ontology.toRdfResource = $wrap_ToRdfResourceFunction(Ontology._toRdfResource);
+    function _propertiesToStrings(_ontology) {
         return $compactRecord({
             $identifier: _ontology.$identifier().toString(),
             label: _ontology.label.map((item) => item.toString()).extract(),
         });
     }
-    Ontology.propertiesToStrings = propertiesToStrings;
+    Ontology._propertiesToStrings = _propertiesToStrings;
     function $toString(_ontology) {
-        return `Ontology(${JSON.stringify(propertiesToStrings((_ontology ?? this)))})`;
+        return `Ontology(${JSON.stringify(_propertiesToStrings((_ontology ?? this)))})`;
     }
     Ontology.$toString = $toString;
 })(Ontology || (Ontology = {}));
@@ -3898,50 +3732,24 @@ export var NodeShape;
         }
         if (filter.tsFeatureIncludes !== undefined &&
             !$filterArray($filterIri)(filter.tsFeatureIncludes, value.tsFeatureIncludes)) {
-            return false;
-        }
-        if (filter.tsImports !== undefined &&
-            !$filterArray($filterString)(filter.tsImports, value.tsImports)) {
-            return false;
-        }
-        if (filter.types !== undefined &&
-            !$filterArray($filterIri)(filter.types, value.types)) {
-            return false;
-        }
-        if (filter.xone !== undefined &&
-            !$filterMaybe($filterArray($filterIdentifier))(filter.xone, value.xone)) {
-            return false;
-        }
-        return true;
-    }
-    NodeShape.filter = filter;
-    NodeShape.fromRdfResource = (resource, options) => {
-        let { context, graph, ignoreRdfType = false, objectSet, preferredLanguages, } = options ?? {};
-        if (!objectSet) {
-            objectSet = new $RdfjsDatasetObjectSet(resource.dataset);
-        }
-        return NodeShape.propertiesFromRdfResource(resource, {
-            context,
-            graph,
-            ignoreRdfType,
-            objectSet,
-            preferredLanguages,
-        }).map(create);
-    };
-    NodeShape.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
-        .toResource()
-        .chain((resource) => NodeShape.fromRdfResource(resource, options))));
-    NodeShape.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape");
-    function isNodeShape(object) {
-        switch (object.$type) {
-            case "NodeShape":
-                return true;
-            default:
-                return false;
+            return false;
+        }
+        if (filter.tsImports !== undefined &&
+            !$filterArray($filterString)(filter.tsImports, value.tsImports)) {
+            return false;
+        }
+        if (filter.types !== undefined &&
+            !$filterArray($filterIri)(filter.types, value.types)) {
+            return false;
+        }
+        if (filter.xone !== undefined &&
+            !$filterMaybe($filterArray($filterIdentifier))(filter.xone, value.xone)) {
+            return false;
         }
+        return true;
     }
-    NodeShape.isNodeShape = isNodeShape;
-    NodeShape.propertiesFromRdfResource = ($resource, _$options) => {
+    NodeShape.filter = filter;
+    NodeShape._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -3960,860 +3768,683 @@ export var NodeShape;
                 }
                 return Left(new Error(`${$resource.identifier} has unexpected RDF type (actual: ${actualRdfType.value}, expected: http://www.w3.org/ns/shacl#NodeShape)`));
             })
-            : Right(true)).chain((_rdfTypeCheck) => Right(new Resource.Value({
-            dataFactory: dataFactory,
-            focusResource: $resource,
-            propertyPath: $RdfVocabularies.rdf.subject,
-            term: $resource.identifier,
-        }).toValues())
-            .chain((values) => values.chainMap((value) => value.toIdentifier()))
-            .chain((values) => values.head())
-            .chain(($identifier) => Right("NodeShape").chain(($type) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.and,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
+            : Right(true)).chain((_rdfTypeCheck) => $sequenceRecord({
+            $identifier: Right(new Resource.Value({
+                dataFactory: dataFactory,
                 focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.and.path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                propertyPath: $RdfVocabularies.rdf.subject,
+                term: $resource.identifier,
+            }).toValues())
+                .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                .chain((values) => values.head()),
+            and: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.and,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
                     propertyPath: PropertyShape.schema.properties.and.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((and) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.classes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.classes.path,
-                value: valuesArray,
-            })),
-        }).chain((classes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.closed,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.schema.properties.closed.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((closed) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.comment,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.comment.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((comment) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.datatype,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties.datatype
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((datatype) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.deactivated,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema.properties
-                        .deactivated.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((deactivated) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.discriminantValue,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.schema.properties
-                        .discriminantValue.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((discriminantValue) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.extern,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.schema.properties.extern
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((extern) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.flags,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties.flags
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((flags) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.fromRdfType,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.schema.properties
-                        .fromRdfType.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((fromRdfType) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.hasValues,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
-                switch (term.termType) {
-                    case "NamedNode":
-                    case "Literal":
-                        return Either.of(term);
-                    default:
-                        return Left(new Resource.MistypedTermValueError({
-                            actualValue: term,
-                            expectedValueType: "(NamedNode | Literal)",
-                            focusResource: $resource,
-                            propertyPath: PropertyShape.schema
-                                .properties.hasValues
-                                .path,
-                        }));
-                }
-            })))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema.properties
-                    .hasValues.path,
-                value: valuesArray,
-            })),
-        }).chain((hasValues) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.ignoredProperties,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.and.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            classes: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: NodeShape.schema.properties
-                    .ignoredProperties.path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIri()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.classes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: NodeShape.schema.properties
-                        .ignoredProperties.path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.classes.path,
+                    value: valuesArray,
                 })),
-        }).chain((ignoredProperties) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.in_,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+            }),
+            closed: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape.schema
-                    .properties.in_.path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value
-                .toTerm()
-                .chain((term) => {
-                switch (term.termType) {
-                    case "NamedNode":
-                    case "Literal":
-                        return Either.of(term);
-                    default:
-                        return Left(new Resource.MistypedTermValueError({
-                            actualValue: term,
-                            expectedValueType: "(NamedNode | Literal)",
-                            focusResource: $resource,
-                            propertyPath: PropertyShape
-                                .schema
-                                .properties
-                                .in_.path,
-                        }));
-                }
-            })))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.in_.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((in_) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.isDefinedBy,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.isDefinedBy
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((isDefinedBy) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.label,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties.label
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((label) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.languageIn,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.closed,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.closed.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            comment: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .languageIn
-                    .path,
-                values: valueList.toArray(),
-            }))
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.comment,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.comment.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            datatype: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.datatype,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.datatype.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            deactivated: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.deactivated,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.deactivated.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            discriminantValue: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.discriminantValue,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.discriminantValue.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            extern: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.extern,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.extern.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            flags: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.flags,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties
-                        .languageIn.path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.flags.path,
+                    value: valuesArray,
                 })),
-        }).chain((languageIn) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties.maxCount,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            fromRdfType: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.fromRdfType,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.fromRdfType.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            hasValues: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.hasValues,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.hasValues.path,
+                            }));
+                    }
+                })))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.schema
-                        .properties
-                        .maxCount.path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.hasValues.path,
+                    value: valuesArray,
                 })),
-        }).chain((maxCount) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .maxExclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            ignoredProperties: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.ignoredProperties,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .maxExclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxExclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .maxInclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: NodeShape.schema.properties.ignoredProperties.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIri()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.ignoredProperties.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            in_: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.in_,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .maxInclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxInclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .maxLength,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: PropertyShape.schema.properties.in_.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
+                    switch (term.termType) {
+                        case "NamedNode":
+                        case "Literal":
+                            return Either.of(term);
+                        default:
+                            return Left(new Resource.MistypedTermValueError({
+                                actualValue: term,
+                                expectedValueType: "(NamedNode | Literal)",
+                                focusResource: $resource,
+                                propertyPath: PropertyShape.schema.properties.in_.path,
+                            }));
+                    }
+                })))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.in_.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            isDefinedBy: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.isDefinedBy,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.isDefinedBy.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            label: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.label,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.label.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            languageIn: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.languageIn,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .maxLength
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((maxLength) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .minCount,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: PropertyShape.schema.properties.languageIn.path,
+                    values: valueList.toArray(),
+                }))
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.languageIn.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxCount: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.maxCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxCount.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxExclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.maxExclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxExclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxInclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.maxInclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxInclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            maxLength: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.maxLength,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.maxLength.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minCount: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.minCount,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minCount.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minExclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.minExclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minExclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minInclusive: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.minInclusive,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toLiteral()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minInclusive.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            minLength: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.minLength,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBigInt()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.minLength.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            mutable: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.mutable,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toBoolean()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.mutable.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            node: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.node,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.node.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            nodeKind: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.nodeKind,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
+                    dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
+                ])))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.nodeKind.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            not: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.not,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minCount
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.not.path,
+                    value: valuesArray,
                 })),
-        }).chain((minCount) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .minExclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            or: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.or,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minExclusive
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((minExclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema.properties
-                .minInclusive,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                    propertyPath: PropertyShape.schema.properties.or.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.or.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            patterns: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.patterns,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minInclusive
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: PropertyShape.schema.properties.patterns.path,
+                    value: valuesArray,
                 })),
-        }).chain((minInclusive) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .minLength,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBigInt()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            properties: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.properties,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIdentifier()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .minLength
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: NodeShape.schema.properties.properties.path,
+                    value: valuesArray,
                 })),
-        }).chain((minLength) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .mutable,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            rdfType: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.rdfType,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: NodeShape.schema.properties.rdfType.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            shaclmateName: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.shaclmateName,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.shaclmateName.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+            subClassOf: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.subClassOf,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .mutable
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: NodeShape.schema.properties.subClassOf.path,
+                    value: valuesArray,
                 })),
-        }).chain((mutable) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .node,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            toRdfTypes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.toRdfTypes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .node
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: NodeShape.schema.properties.toRdfTypes.path,
+                    value: valuesArray,
                 })),
-        }).chain((node) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .nodeKind,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
-                dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
-            ])))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            tsFeatureExcludes: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.tsFeatureExcludes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
+                ])))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .nodeKind
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: Ontology.schema.properties.tsFeatureExcludes.path,
+                    value: valuesArray,
                 })),
-        }).chain((nodeKind) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .not,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .not
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((not) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .or,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+            }),
+            tsFeatureIncludes: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .or
-                    .path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.tsFeatureIncludes,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri([
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
+                    dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
+                ])))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .or
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: Ontology.schema.properties.tsFeatureIncludes.path,
+                    value: valuesArray,
                 })),
-        }).chain((or) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .patterns,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .patterns
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((patterns) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .properties,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIdentifier()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: NodeShape
-                    .schema
-                    .properties
-                    .properties
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((properties) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .rdfType,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            tsImports: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.tsImports,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                    .chain((values) => values.chainMap((value) => value.toString()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: NodeShape
-                        .schema
-                        .properties
-                        .rdfType
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: Ontology.schema.properties.tsImports.path,
+                    value: valuesArray,
                 })),
-        }).chain((rdfType) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .shaclmateName,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+            }),
+            types: $shaclPropertyFromRdf({
+                graph: _$options.graph,
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.types,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toIri()))
+                    .map((values) => values.toArray())
+                    .map((valuesArray) => Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .shaclmateName
-                        .path,
-                    value: Maybe.empty(),
+                    propertyPath: NodeShape.schema.properties.types.path,
+                    value: valuesArray,
                 })),
-        }).chain((shaclmateName) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .subClassOf,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: NodeShape
-                    .schema
-                    .properties
-                    .subClassOf
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((subClassOf) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .toRdfTypes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: NodeShape
-                    .schema
-                    .properties
-                    .toRdfTypes
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((toRdfTypes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .tsFeatureExcludes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
-            ])))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology
-                    .schema
-                    .properties
-                    .tsFeatureExcludes
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((tsFeatureExcludes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .tsFeatureIncludes,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_All"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Create"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_Default"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Equals"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Graphql"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Hash"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Json"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeatures_None"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Rdf"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsFeature_Sparql"),
-            ])))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology
-                    .schema
-                    .properties
-                    .tsFeatureIncludes
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((tsFeatureIncludes) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .tsImports,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology
-                    .schema
-                    .properties
-                    .tsImports
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((tsImports) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .types,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: NodeShape
-                    .schema
-                    .properties
-                    .types
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((types) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.schema
-                .properties
-                .xone,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
+            }),
+            xone: $shaclPropertyFromRdf({
                 graph: _$options.graph,
-            })))
-                .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .schema
-                    .properties
-                    .xone
-                    .path,
-                values: valueList.toArray(),
-            })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
-                .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
+                resource: $resource,
+                propertySchema: NodeShape.schema.properties.xone,
+                typeFromRdf: (resourceValues) => resourceValues
+                    .chain((values) => values.chainMap((value) => value.toList({ graph: _$options.graph })))
+                    .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .schema
-                        .properties
-                        .xone
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).map((xone) => ({
-            $identifier,
-            $type,
-            and,
-            classes,
-            closed,
-            comment,
-            datatype,
-            deactivated,
-            discriminantValue,
-            extern,
-            flags,
-            fromRdfType,
-            hasValues,
-            ignoredProperties,
-            in_,
-            isDefinedBy,
-            label,
-            languageIn,
-            maxCount,
-            maxExclusive,
-            maxInclusive,
-            maxLength,
-            minCount,
-            minExclusive,
-            minInclusive,
-            minLength,
-            mutable,
-            node,
-            nodeKind,
-            not,
-            or,
-            patterns,
-            properties,
-            rdfType,
-            shaclmateName,
-            subClassOf,
-            toRdfTypes,
-            tsFeatureExcludes,
-            tsFeatureIncludes,
-            tsImports,
-            types,
-            xone,
-        }))))))))))))))))))))))))))))))))))))))))))));
+                    propertyPath: PropertyShape.schema.properties.xone.path,
+                    values: valueList.toArray(),
+                })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
+                    .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
+                    .map((values) => values.length > 0
+                    ? values.map((value) => Maybe.of(value))
+                    : Resource.Values.fromValue({
+                        focusResource: $resource,
+                        propertyPath: PropertyShape.schema.properties.xone.path,
+                        value: Maybe.empty(),
+                    })),
+            }),
+        }).map((properties) => create(properties)));
     };
+    NodeShape.fromRdfResource = $wrap_FromRdfResourceFunction(NodeShape._fromRdfResource);
+    NodeShape.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => NodeShape.fromRdfResource(resource, options))));
+    NodeShape.fromRdfType = dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape");
+    function isNodeShape(object) {
+        switch (object.$type) {
+            case "NodeShape":
+                return true;
+            default:
+                return false;
+        }
+    }
+    NodeShape.isNodeShape = isNodeShape;
     NodeShape.schema = {
         properties: {
             $identifier: {
@@ -5205,226 +4836,224 @@ export var NodeShape;
             },
         },
     };
-    function toRdfResource(_nodeShape, options) {
-        const resourceSet = options?.resourceSet ??
-            new ResourceSet({
-                dataFactory: dataFactory,
-                dataset: datasetFactory.dataset(),
-            });
-        const resource = resourceSet.resource(_nodeShape.$identifier());
-        if (!options?.ignoreRdfType) {
-            resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"), options?.graph);
+    NodeShape._toRdfResource = (parameters) => {
+        if (!parameters.ignoreRdfType) {
+            parameters.resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"), parameters.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#and"), _nodeShape.and.toList().flatMap((value) => [
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#and"), parameters.object.and.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#class"), _nodeShape.classes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#closed"), _nodeShape.closed
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#class"), parameters.object.classes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#closed"), parameters.object.closed
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _nodeShape.comment
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), parameters.object.comment
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), _nodeShape.datatype.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), _nodeShape.deactivated
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), parameters.object.datatype.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), parameters.object.deactivated
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#discriminantValue"), _nodeShape.discriminantValue
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#discriminantValue"), parameters.object.discriminantValue
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#extern"), _nodeShape.extern
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#extern"), parameters.object.extern
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), _nodeShape.flags.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#fromRdfType"), _nodeShape.fromRdfType.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), _nodeShape.hasValues.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#ignoredProperties"), _nodeShape.ignoredProperties.toList().flatMap((value) => [
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), parameters.object.flags.flatMap((item) => [$literalFactory.string(item)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#fromRdfType"), parameters.object.fromRdfType.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), parameters.object.hasValues.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#ignoredProperties"), parameters.object.ignoredProperties.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#in"), _nodeShape.in_.toList().flatMap((value) => [
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#in"), parameters.object.in_.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), _nodeShape.isDefinedBy.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _nodeShape.label
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), parameters.object.isDefinedBy.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), parameters.object.label
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), _nodeShape.languageIn.toList().flatMap((value) => [
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), parameters.object.languageIn.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [$literalFactory.string(item)], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [$literalFactory.string(item)], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"), _nodeShape.maxCount
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"), parameters.object.maxCount
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"), _nodeShape.maxExclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"), _nodeShape.maxInclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"), _nodeShape.maxLength
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"), parameters.object.maxExclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"), parameters.object.maxInclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"), parameters.object.maxLength
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"), _nodeShape.minCount
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"), parameters.object.minCount
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"), _nodeShape.minExclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"), _nodeShape.minInclusive.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"), _nodeShape.minLength
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"), parameters.object.minExclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"), parameters.object.minInclusive.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"), parameters.object.minLength
             .toList()
             .flatMap((value) => [
             $literalFactory.bigint(value, $RdfVocabularies.xsd.integer),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"), _nodeShape.mutable
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"), parameters.object.mutable
             .toList()
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), _nodeShape.node.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), _nodeShape.nodeKind.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), _nodeShape.not.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#or"), _nodeShape.or.toList().flatMap((value) => [
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), parameters.object.node.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), parameters.object.nodeKind.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), parameters.object.not.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#or"), parameters.object.or.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), _nodeShape.patterns.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#property"), _nodeShape.properties.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"), _nodeShape.rdfType.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _nodeShape.shaclmateName
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), parameters.object.patterns.flatMap((item) => [
+            $literalFactory.string(item),
+        ]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#property"), parameters.object.properties.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"), parameters.object.rdfType.toList(), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), parameters.object.shaclmateName
             .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add($RdfVocabularies.rdfs.subClassOf, _nodeShape.subClassOf.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"), _nodeShape.toRdfTypes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), _nodeShape.tsFeatureExcludes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), _nodeShape.tsFeatureIncludes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), _nodeShape.tsImports.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add($RdfVocabularies.rdf.type, _nodeShape.types.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), _nodeShape.xone.toList().flatMap((value) => [
+            .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
+        parameters.resource.add($RdfVocabularies.rdfs.subClassOf, parameters.object.subClassOf.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"), parameters.object.toRdfTypes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), parameters.object.tsFeatureExcludes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), parameters.object.tsFeatureIncludes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), parameters.object.tsImports.flatMap((item) => [
+            $literalFactory.string(item),
+        ]), parameters.graph);
+        parameters.resource.add($RdfVocabularies.rdf.type, parameters.object.types.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), parameters.object.xone.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
                     if (itemIndex === 0) {
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
+                        const newSubListResource = parameters.resourceSet.resource((() => dataFactory.blankNode())());
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, parameters.graph);
                         currentSubListResource = newSubListResource;
                     }
-                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], options?.graph);
+                    currentSubListResource.add($RdfVocabularies.rdf.first, [item], parameters.graph);
                     if (itemIndex + 1 === list.length) {
-                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, options?.graph);
+                        currentSubListResource.add($RdfVocabularies.rdf.rest, $RdfVocabularies.rdf.nil, parameters.graph);
                     }
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
+                    listResource: parameters.resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
-        ]), options?.graph);
-        return resource;
-    }
-    NodeShape.toRdfResource = toRdfResource;
-    function propertiesToStrings(_nodeShape) {
+        ]), parameters.graph);
+        return parameters.resource;
+    };
+    NodeShape.toRdfResource = $wrap_ToRdfResourceFunction(NodeShape._toRdfResource);
+    function _propertiesToStrings(_nodeShape) {
         return $compactRecord({
             $identifier: _nodeShape.$identifier().toString(),
             label: _nodeShape.label.map((item) => item.toString()).extract(),
@@ -5433,9 +5062,9 @@ export var NodeShape;
                 .extract(),
         });
     }
-    NodeShape.propertiesToStrings = propertiesToStrings;
+    NodeShape._propertiesToStrings = _propertiesToStrings;
     function $toString(_nodeShape) {
-        return `NodeShape(${JSON.stringify(propertiesToStrings((_nodeShape ?? this)))})`;
+        return `NodeShape(${JSON.stringify(_propertiesToStrings((_nodeShape ?? this)))})`;
     }
     NodeShape.$toString = $toString;
 })(NodeShape || (NodeShape = {}));
@@ -5760,12 +5389,12 @@ export var Shape;
             },
         },
     };
-    Shape.toRdfResource = (value, options) => {
-        if (NodeShape.isNodeShape(value)) {
-            return NodeShape.toRdfResource(value, options);
+    Shape.toRdfResource = (object, options) => {
+        if (NodeShape.isNodeShape(object)) {
+            return NodeShape.toRdfResource(object, options);
         }
-        if (PropertyShape.isPropertyShape(value)) {
-            return PropertyShape.toRdfResource(value, options);
+        if (PropertyShape.isPropertyShape(object)) {
+            return PropertyShape.toRdfResource(object, options);
         }
         throw new Error("unrecognized type");
     };
@@ -5930,18 +5559,18 @@ export var $Object;
             },
         },
     };
-    $Object.toRdfResource = (value, options) => {
-        if (NodeShape.isNodeShape(value)) {
-            return NodeShape.toRdfResource(value, options);
+    $Object.toRdfResource = (object, options) => {
+        if (NodeShape.isNodeShape(object)) {
+            return NodeShape.toRdfResource(object, options);
         }
-        if (Ontology.isOntology(value)) {
-            return Ontology.toRdfResource(value, options);
+        if (Ontology.isOntology(object)) {
+            return Ontology.toRdfResource(object, options);
         }
-        if (PropertyGroup.isPropertyGroup(value)) {
-            return PropertyGroup.toRdfResource(value, options);
+        if (PropertyGroup.isPropertyGroup(object)) {
+            return PropertyGroup.toRdfResource(object, options);
         }
-        if (PropertyShape.isPropertyShape(value)) {
-            return PropertyShape.toRdfResource(value, options);
+        if (PropertyShape.isPropertyShape(object)) {
+            return PropertyShape.toRdfResource(object, options);
         }
         throw new Error("unrecognized type");
     };