@shaclmate/shacl-ast 4.0.29 → 4.0.31

package/dist/generated.js

@@ -191,16 +191,16 @@ const $literalFactory = new LiteralFactory({ dataFactory: dataFactory });
 const $parseIdentifier = NTriplesIdentifier.parser(dataFactory);
 export var $PropertyPath;
 (function ($PropertyPath) {
-    function $filter(_filter, _value) {
+    function filter(_filter, _value) {
         return true;
     }
-    $PropertyPath.$filter = $filter;
-    $PropertyPath.$fromRdfResource = RdfxResourcePropertyPath.fromResource;
-    $PropertyPath.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
+    $PropertyPath.filter = filter;
+    $PropertyPath.fromRdfResource = RdfxResourcePropertyPath.fromResource;
+    $PropertyPath.fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
         .toResource()
-        .chain((resource) => $PropertyPath.$fromRdfResource(resource, options))));
-    $PropertyPath.$schema = {};
-    $PropertyPath.$toRdfResource = RdfxResourcePropertyPath.toResource;
+        .chain((resource) => $PropertyPath.fromRdfResource(resource, options))));
+    $PropertyPath.schema = {};
+    $PropertyPath.toRdfResource = RdfxResourcePropertyPath.toResource;
     $PropertyPath.$toString = RdfxResourcePropertyPath.toString;
 })($PropertyPath || ($PropertyPath = {}));
 var $RdfVocabularies;
@@ -244,9 +244,44 @@ var $RdfVocabularies;
 function $shaclPropertyFromRdf({ graph, propertySchema, resource, typeFromRdf, }) {
     return typeFromRdf(Right(resource.values(propertySchema.path, { graph, unique: true }))).chain((values) => values.head());
 }
+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) {
+    function create(parameters) {
         const $identifierParameter = parameters.$identifier;
         let $identifier;
         if (typeof $identifierParameter === "function") {
@@ -835,13 +870,13 @@ export var PropertyShape;
             xone,
         };
     }
-    PropertyShape.$create = $create;
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = PropertyShape.$Identifier || (PropertyShape.$Identifier = {}));
-    function $filter(filter, value) {
+    PropertyShape.create = create;
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = PropertyShape.Identifier || (PropertyShape.Identifier = {}));
+    function filter(filter, value) {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
@@ -959,7 +994,7 @@ export var PropertyShape;
             return false;
         }
         if (filter.path !== undefined &&
-            !$PropertyPath.$filter(filter.path, value.path)) {
+            !$PropertyPath.filter(filter.path, value.path)) {
             return false;
         }
         if (filter.patterns !== undefined &&
@@ -976,34 +1011,8 @@ 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.filter = filter;
+    PropertyShape._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -1015,7 +1024,7 @@ export var PropertyShape;
                         return Right(true);
                 }
                 // Check arbitrary rdfs:subClassOf's of the expected type
-                if ($resource.isInstanceOf(PropertyShape.$fromRdfType, {
+                if ($resource.isInstanceOf(PropertyShape.fromRdfType, {
                     graph: _$options.graph,
                 })) {
                     return Right(true);
@@ -1030,15 +1039,15 @@ export var PropertyShape;
         }).toValues())
             .chain((values) => values.chainMap((value) => value.toIdentifier()))
             .chain((values) => values.head())
-            .chain(($identifier) => Right("PropertyShape").chain(($type) => $shaclPropertyFromRdf({
+            .chain(($identifier) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.and,
+            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,
+                propertyPath: PropertyShape.schema.properties.and.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
                 .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
@@ -1046,25 +1055,25 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.and.path,
+                    propertyPath: PropertyShape.schema.properties.and.path,
                     value: Maybe.empty(),
                 })),
         }).chain((and) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.classes,
+            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,
+                propertyPath: PropertyShape.schema.properties.classes.path,
                 value: valuesArray,
             })),
         }).chain((classes) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.comment,
+            propertySchema: PropertyShape.schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -1072,41 +1081,40 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    propertyPath: PropertyShape.schema.properties.comment.path,
                     value: Maybe.empty(),
                 })),
         }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.datatype,
+            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,
+                    propertyPath: PropertyShape.schema.properties.datatype.path,
                     value: Maybe.empty(),
                 })),
         }).chain((datatype) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.deactivated,
+            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
+                    propertyPath: PropertyShape.schema.properties.deactivated
                         .path,
                     value: Maybe.empty(),
                 })),
         }).chain((deactivated) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.defaultValue,
+            propertySchema: PropertyShape.schema.properties.defaultValue,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
                 switch (term.termType) {
@@ -1118,7 +1126,7 @@ export var PropertyShape;
                             actualValue: term,
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
-                            propertyPath: PropertyShape.$schema.properties
+                            propertyPath: PropertyShape.schema.properties
                                 .defaultValue.path,
                         }));
                 }
@@ -1127,14 +1135,14 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties
-                        .defaultValue.path,
+                    propertyPath: PropertyShape.schema.properties.defaultValue
+                        .path,
                     value: Maybe.empty(),
                 })),
         }).chain((defaultValue) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.description,
+            propertySchema: PropertyShape.schema.properties.description,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -1142,41 +1150,40 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties
+                    propertyPath: PropertyShape.schema.properties
                         .description.path,
                     value: Maybe.empty(),
                 })),
         }).chain((description) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.flags,
+            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.flags
-                    .path,
+                propertyPath: PropertyShape.schema.properties.flags.path,
                 value: valuesArray,
             })),
         }).chain((flags) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.groups,
+            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.groups
+                propertyPath: PropertyShape.schema.properties.groups
                     .path,
                 value: valuesArray,
             })),
         }).chain((groups) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.hasValues,
+            propertySchema: PropertyShape.schema.properties.hasValues,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
                 switch (term.termType) {
@@ -1188,7 +1195,7 @@ export var PropertyShape;
                             actualValue: term,
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
-                            propertyPath: PropertyShape.$schema
+                            propertyPath: PropertyShape.schema
                                 .properties.hasValues
                                 .path,
                         }));
@@ -1197,21 +1204,21 @@ export var PropertyShape;
                 .map((values) => values.toArray())
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties
+                propertyPath: PropertyShape.schema.properties
                     .hasValues.path,
                 value: valuesArray,
             })),
         }).chain((hasValues) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.in_,
+            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
+                propertyPath: PropertyShape.schema.properties
                     .in_.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
@@ -1224,8 +1231,7 @@ export var PropertyShape;
                             actualValue: term,
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
-                            propertyPath: PropertyShape
-                                .$schema
+                            propertyPath: PropertyShape.schema
                                 .properties.in_
                                 .path,
                         }));
@@ -1236,29 +1242,28 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties
+                    propertyPath: PropertyShape.schema.properties
                         .in_.path,
                     value: Maybe.empty(),
                 })),
         }).chain((in_) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.isDefinedBy,
+            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,
+                    propertyPath: PropertyShape.schema.properties
+                        .isDefinedBy.path,
                     value: Maybe.empty(),
                 })),
         }).chain((isDefinedBy) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.label,
+            propertySchema: PropertyShape.schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -1266,21 +1271,21 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
+                    propertyPath: PropertyShape.schema
                         .properties.label.path,
                     value: Maybe.empty(),
                 })),
         }).chain((label) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.languageIn,
+            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
+                propertyPath: PropertyShape.schema
                     .properties.languageIn
                     .path,
                 values: valueList.toArray(),
@@ -1292,7 +1297,7 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
+                    propertyPath: PropertyShape.schema
                         .properties.languageIn
                         .path,
                     value: Maybe.empty(),
@@ -1300,14 +1305,14 @@ export var PropertyShape;
         }).chain((languageIn) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.maxCount,
+            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
+                    propertyPath: PropertyShape.schema
                         .properties.maxCount
                         .path,
                     value: Maybe.empty(),
@@ -1315,7 +1320,7 @@ export var PropertyShape;
         }).chain((maxCount) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.maxExclusive,
+            propertySchema: PropertyShape.schema.properties.maxExclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toLiteral()))
@@ -1323,7 +1328,7 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
+                    propertyPath: PropertyShape.schema
                         .properties
                         .maxExclusive.path,
                     value: Maybe.empty(),
@@ -1331,7 +1336,7 @@ export var PropertyShape;
         }).chain((maxExclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.maxInclusive,
+            propertySchema: PropertyShape.schema.properties.maxInclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toLiteral()))
@@ -1339,25 +1344,22 @@ export var PropertyShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .$schema
+                    propertyPath: PropertyShape.schema
                         .properties
-                        .maxInclusive
-                        .path,
+                        .maxInclusive.path,
                     value: Maybe.empty(),
                 })),
         }).chain((maxInclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.maxLength,
+            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
+                    propertyPath: PropertyShape.schema
                         .properties
                         .maxLength.path,
                     value: Maybe.empty(),
@@ -1365,7 +1367,7 @@ export var PropertyShape;
         }).chain((maxLength) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.minCount,
+            propertySchema: PropertyShape.schema.properties.minCount,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toBigInt()))
                 .map((values) => values.length > 0
@@ -1373,16 +1375,15 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
-                        .minCount
-                        .path,
+                        .minCount.path,
                     value: Maybe.empty(),
                 })),
         }).chain((minCount) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties
+            propertySchema: PropertyShape.schema.properties
                 .minExclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -1392,7 +1393,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minExclusive
                         .path,
@@ -1401,7 +1402,7 @@ export var PropertyShape;
         }).chain((minExclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties
+            propertySchema: PropertyShape.schema.properties
                 .minInclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -1411,7 +1412,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minInclusive
                         .path,
@@ -1420,7 +1421,7 @@ export var PropertyShape;
         }).chain((minInclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties
+            propertySchema: PropertyShape.schema.properties
                 .minLength,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toBigInt()))
@@ -1429,7 +1430,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minLength
                         .path,
@@ -1438,18 +1439,17 @@ export var PropertyShape;
         }).chain((minLength) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties
+            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
+                .map((values) => values.length > 0
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .name
                         .path,
@@ -1458,8 +1458,7 @@ export var PropertyShape;
         }).chain((name) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
-                .properties
+            propertySchema: PropertyShape.schema.properties
                 .node,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toIdentifier()))
@@ -1469,7 +1468,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .node
                         .path,
@@ -1478,7 +1477,7 @@ export var PropertyShape;
         }).chain((node) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .nodeKind,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1496,7 +1495,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .nodeKind
                         .path,
@@ -1505,7 +1504,7 @@ export var PropertyShape;
         }).chain((nodeKind) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .not,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1514,7 +1513,7 @@ export var PropertyShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .not
                     .path,
@@ -1523,7 +1522,7 @@ export var PropertyShape;
         }).chain((not) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .or,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1533,7 +1532,7 @@ export var PropertyShape;
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .or
                     .path,
@@ -1546,7 +1545,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .or
                         .path,
@@ -1555,7 +1554,7 @@ export var PropertyShape;
         }).chain((or) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .order,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1566,7 +1565,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .order
                         .path,
@@ -1575,10 +1574,10 @@ export var PropertyShape;
         }).chain((order) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .path,
-            typeFromRdf: (resourceValues) => $PropertyPath.$fromRdfResourceValues(resourceValues, {
+            typeFromRdf: (resourceValues) => $PropertyPath.fromRdfResourceValues(resourceValues, {
                 context: _$options.context,
                 graph: _$options.graph,
                 preferredLanguages: _$options.preferredLanguages,
@@ -1586,7 +1585,7 @@ export var PropertyShape;
                 resource: $resource,
                 ignoreRdfType: true,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .path
                     .path,
@@ -1594,7 +1593,7 @@ export var PropertyShape;
         }).chain((path) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .patterns,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1604,7 +1603,7 @@ export var PropertyShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .patterns
                     .path,
@@ -1613,7 +1612,7 @@ export var PropertyShape;
         }).chain((patterns) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .uniqueLang,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1624,7 +1623,7 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .uniqueLang
                         .path,
@@ -1633,7 +1632,7 @@ export var PropertyShape;
         }).chain((uniqueLang) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema
+            propertySchema: PropertyShape.schema
                 .properties
                 .xone,
             typeFromRdf: (resourceValues) => resourceValues
@@ -1643,7 +1642,7 @@ export var PropertyShape;
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .xone
                     .path,
@@ -1656,15 +1655,14 @@ export var PropertyShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .xone
                         .path,
                     value: Maybe.empty(),
                 })),
-        }).map((xone) => ({
+        }).map((xone) => create({
             $identifier,
-            $type,
             and,
             classes,
             comment,
@@ -1697,9 +1695,23 @@ export var PropertyShape;
             patterns,
             uniqueLang,
             xone,
-        }))))))))))))))))))))))))))))))))))));
+        })))))))))))))))))))))))))))))))))));
     };
-    PropertyShape.$schema = {
+    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: {
                 kind: "Identifier",
@@ -1960,7 +1972,7 @@ export var PropertyShape;
             },
             path: {
                 kind: "Shacl",
-                type: () => $PropertyPath.$schema,
+                type: () => $PropertyPath.schema,
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#path"),
             },
             patterns: {
@@ -1992,198 +2004,194 @@ 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://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) => [
+            .flatMap((value) => [$literalFactory.string(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://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://www.w3.org/ns/shacl#uniqueLang"), _propertyShape.uniqueLang
+        ], 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#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(),
@@ -2191,15 +2199,15 @@ export var PropertyShape;
             path: $PropertyPath.$toString(_propertyShape.path),
         });
     }
-    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 = {}));
 export var PropertyGroup;
 (function (PropertyGroup) {
-    function $create(parameters) {
+    function create(parameters) {
         const $identifierParameter = parameters?.$identifier;
         let $identifier;
         if (typeof $identifierParameter === "function") {
@@ -2247,13 +2255,13 @@ export var PropertyGroup;
         }
         return { $identifier, $type, comment, label };
     }
-    PropertyGroup.$create = $create;
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = PropertyGroup.$Identifier || (PropertyGroup.$Identifier = {}));
-    function $filter(filter, value) {
+    PropertyGroup.create = create;
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = PropertyGroup.Identifier || (PropertyGroup.Identifier = {}));
+    function filter(filter, value) {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
@@ -2268,34 +2276,8 @@ 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.filter = filter;
+    PropertyGroup._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -2307,7 +2289,7 @@ export var PropertyGroup;
                         return Right(true);
                 }
                 // Check arbitrary rdfs:subClassOf's of the expected type
-                if ($resource.isInstanceOf(PropertyGroup.$fromRdfType, {
+                if ($resource.isInstanceOf(PropertyGroup.fromRdfType, {
                     graph: _$options.graph,
                 })) {
                     return Right(true);
@@ -2322,10 +2304,10 @@ export var PropertyGroup;
         }).toValues())
             .chain((values) => values.chainMap((value) => value.toIdentifier()))
             .chain((values) => values.head())
-            .chain(($identifier) => Right("PropertyGroup").chain(($type) => $shaclPropertyFromRdf({
+            .chain(($identifier) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyGroup.$schema.properties.comment,
+            propertySchema: PropertyGroup.schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -2333,13 +2315,13 @@ export var PropertyGroup;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    propertyPath: PropertyShape.schema.properties.comment.path,
                     value: Maybe.empty(),
                 })),
         }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyGroup.$schema.properties.label,
+            propertySchema: PropertyGroup.schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -2347,12 +2329,26 @@ export var PropertyGroup;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.label.path,
+                    propertyPath: PropertyShape.schema.properties.label.path,
                     value: Maybe.empty(),
                 })),
-        }).map((label) => ({ $identifier, $type, comment, label }))))));
+        }).map((label) => create({ $identifier, comment, label })))));
     };
-    PropertyGroup.$schema = {
+    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: {
                 kind: "Identifier",
@@ -2383,40 +2379,34 @@ 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 = {}));
 export var Ontology;
 (function (Ontology) {
-    function $create(parameters) {
+    function create(parameters) {
         const $identifierParameter = parameters?.$identifier;
         let $identifier;
         if (typeof $identifierParameter === "function") {
@@ -2464,13 +2454,13 @@ export var Ontology;
         }
         return { $identifier, $type, comment, label };
     }
-    Ontology.$create = $create;
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = Ontology.$Identifier || (Ontology.$Identifier = {}));
-    function $filter(filter, value) {
+    Ontology.create = create;
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = Ontology.Identifier || (Ontology.Identifier = {}));
+    function filter(filter, value) {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
@@ -2485,34 +2475,8 @@ 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.filter = filter;
+    Ontology._fromRdfResource = ($resource, _$options) => {
         return (!_$options.ignoreRdfType
             ? $resource
                 .value($RdfVocabularies.rdf.type, { graph: _$options.graph })
@@ -2524,7 +2488,7 @@ export var Ontology;
                         return Right(true);
                 }
                 // Check arbitrary rdfs:subClassOf's of the expected type
-                if ($resource.isInstanceOf(Ontology.$fromRdfType, {
+                if ($resource.isInstanceOf(Ontology.fromRdfType, {
                     graph: _$options.graph,
                 })) {
                     return Right(true);
@@ -2539,10 +2503,10 @@ export var Ontology;
         }).toValues())
             .chain((values) => values.chainMap((value) => value.toIdentifier()))
             .chain((values) => values.head())
-            .chain(($identifier) => Right("Ontology").chain(($type) => $shaclPropertyFromRdf({
+            .chain(($identifier) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: Ontology.$schema.properties.comment,
+            propertySchema: Ontology.schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -2550,13 +2514,13 @@ export var Ontology;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    propertyPath: PropertyShape.schema.properties.comment.path,
                     value: Maybe.empty(),
                 })),
         }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: Ontology.$schema.properties.label,
+            propertySchema: Ontology.schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -2564,12 +2528,26 @@ export var Ontology;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.label.path,
+                    propertyPath: PropertyShape.schema.properties.label.path,
                     value: Maybe.empty(),
                 })),
-        }).map((label) => ({ $identifier, $type, comment, label }))))));
+        }).map((label) => create({ $identifier, comment, label })))));
     };
-    Ontology.$schema = {
+    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: {
                 kind: "Identifier",
@@ -2600,40 +2578,34 @@ 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);
-        return resource;
-    }
-    Ontology.$toRdfResource = $toRdfResource;
-    function $propertiesToStrings(_ontology) {
+            .flatMap((value) => [$literalFactory.string(value)]), 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 = {}));
 export var NodeShape;
 (function (NodeShape) {
-    function $create(parameters) {
+    function create(parameters) {
         const $identifierParameter = parameters?.$identifier;
         let $identifier;
         if (typeof $identifierParameter === "function") {
@@ -3193,13 +3165,13 @@ export var NodeShape;
             xone,
         };
     }
-    NodeShape.$create = $create;
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = NodeShape.$Identifier || (NodeShape.$Identifier = {}));
-    function $filter(filter, value) {
+    NodeShape.create = create;
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = NodeShape.Identifier || (NodeShape.Identifier = {}));
+    function filter(filter, value) {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
@@ -3326,34 +3298,8 @@ export var NodeShape;
         }
         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;
-        }
-    }
-    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 })
@@ -3365,7 +3311,7 @@ export var NodeShape;
                         return Right(true);
                 }
                 // Check arbitrary rdfs:subClassOf's of the expected type
-                if ($resource.isInstanceOf(NodeShape.$fromRdfType, {
+                if ($resource.isInstanceOf(NodeShape.fromRdfType, {
                     graph: _$options.graph,
                 })) {
                     return Right(true);
@@ -3380,15 +3326,15 @@ export var NodeShape;
         }).toValues())
             .chain((values) => values.chainMap((value) => value.toIdentifier()))
             .chain((values) => values.head())
-            .chain(($identifier) => Right("NodeShape").chain(($type) => $shaclPropertyFromRdf({
+            .chain(($identifier) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.and,
+            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,
+                propertyPath: PropertyShape.schema.properties.and.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toIdentifier()))))
                 .map((valueLists) => valueLists.map((valueList) => valueList.toArray()))
@@ -3396,38 +3342,38 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.and.path,
+                    propertyPath: PropertyShape.schema.properties.and.path,
                     value: Maybe.empty(),
                 })),
         }).chain((and) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.classes,
+            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,
+                propertyPath: PropertyShape.schema.properties.classes.path,
                 value: valuesArray,
             })),
         }).chain((classes) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.closed,
+            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,
+                    propertyPath: NodeShape.schema.properties.closed.path,
                     value: Maybe.empty(),
                 })),
         }).chain((closed) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.comment,
+            propertySchema: NodeShape.schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -3435,54 +3381,53 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    propertyPath: PropertyShape.schema.properties.comment.path,
                     value: Maybe.empty(),
                 })),
         }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.datatype,
+            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,
+                    propertyPath: PropertyShape.schema.properties.datatype.path,
                     value: Maybe.empty(),
                 })),
         }).chain((datatype) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.deactivated,
+            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,
+                    propertyPath: PropertyShape.schema.properties.deactivated
+                        .path,
                     value: Maybe.empty(),
                 })),
         }).chain((deactivated) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.flags,
+            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,
+                propertyPath: PropertyShape.schema.properties.flags.path,
                 value: valuesArray,
             })),
         }).chain((flags) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.hasValues,
+            propertySchema: NodeShape.schema.properties.hasValues,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
                 switch (term.termType) {
@@ -3494,27 +3439,27 @@ export var NodeShape;
                             actualValue: term,
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
-                            propertyPath: PropertyShape.$schema
-                                .properties.hasValues.path,
+                            propertyPath: PropertyShape.schema.properties
+                                .hasValues.path,
                         }));
                 }
             })))
                 .map((values) => values.toArray())
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties.hasValues
+                propertyPath: PropertyShape.schema.properties.hasValues
                     .path,
                 value: valuesArray,
             })),
         }).chain((hasValues) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.ignoredProperties,
+            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: NodeShape.$schema.properties
+                propertyPath: NodeShape.schema.properties
                     .ignoredProperties.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toIri()))))
@@ -3523,22 +3468,20 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: NodeShape.$schema.properties
+                    propertyPath: NodeShape.schema.properties
                         .ignoredProperties.path,
                     value: Maybe.empty(),
                 })),
         }).chain((ignoredProperties) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.in_,
+            propertySchema: NodeShape.schema.properties.in_,
             typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toList({
-                graph: _$options.graph,
-            })))
+                .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
-                    .in_.path,
+                propertyPath: PropertyShape.schema.properties.in_
+                    .path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toTerm().chain((term) => {
                 switch (term.termType) {
@@ -3550,9 +3493,8 @@ export var NodeShape;
                             actualValue: term,
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
-                            propertyPath: PropertyShape.$schema
-                                .properties.in_
-                                .path,
+                            propertyPath: PropertyShape.schema
+                                .properties.in_.path,
                         }));
                 }
             })))))
@@ -3561,28 +3503,28 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties
-                        .in_.path,
+                    propertyPath: PropertyShape.schema.properties.in_
+                        .path,
                     value: Maybe.empty(),
                 })),
         }).chain((in_) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.isDefinedBy,
+            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
+                    propertyPath: PropertyShape.schema.properties
                         .isDefinedBy.path,
                     value: Maybe.empty(),
                 })),
         }).chain((isDefinedBy) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.label,
+            propertySchema: NodeShape.schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
@@ -3590,23 +3532,22 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
-                        .properties.label.path,
+                    propertyPath: PropertyShape.schema.properties
+                        .label.path,
                     value: Maybe.empty(),
                 })),
         }).chain((label) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.languageIn,
+            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.languageIn
-                    .path,
+                propertyPath: PropertyShape.schema
+                    .properties.languageIn.path,
                 values: valueList.toArray(),
             }))
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -3616,30 +3557,28 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
-                        .properties.languageIn
-                        .path,
+                    propertyPath: PropertyShape.schema
+                        .properties.languageIn.path,
                     value: Maybe.empty(),
                 })),
         }).chain((languageIn) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.maxCount,
+            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,
+                    propertyPath: PropertyShape.schema
+                        .properties.maxCount.path,
                     value: Maybe.empty(),
                 })),
         }).chain((maxCount) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.maxExclusive,
+            propertySchema: NodeShape.schema.properties.maxExclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toLiteral()))
@@ -3647,15 +3586,15 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
-                        .properties
-                        .maxExclusive.path,
+                    propertyPath: PropertyShape.schema
+                        .properties.maxExclusive
+                        .path,
                     value: Maybe.empty(),
                 })),
         }).chain((maxExclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.maxInclusive,
+            propertySchema: NodeShape.schema.properties.maxInclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toLiteral()))
@@ -3663,7 +3602,7 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema
+                    propertyPath: PropertyShape.schema
                         .properties
                         .maxInclusive.path,
                     value: Maybe.empty(),
@@ -3671,15 +3610,14 @@ export var NodeShape;
         }).chain((maxInclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.maxLength,
+            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
+                    propertyPath: PropertyShape.schema
                         .properties
                         .maxLength.path,
                     value: Maybe.empty(),
@@ -3687,15 +3625,14 @@ export var NodeShape;
         }).chain((maxLength) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.minCount,
+            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
+                    propertyPath: PropertyShape.schema
                         .properties
                         .minCount.path,
                     value: Maybe.empty(),
@@ -3703,7 +3640,7 @@ export var NodeShape;
         }).chain((minCount) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties
+            propertySchema: NodeShape.schema.properties
                 .minExclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -3713,7 +3650,7 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minExclusive
                         .path,
@@ -3722,7 +3659,7 @@ export var NodeShape;
         }).chain((minExclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties
+            propertySchema: NodeShape.schema.properties
                 .minInclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -3732,7 +3669,7 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minInclusive
                         .path,
@@ -3741,7 +3678,7 @@ export var NodeShape;
         }).chain((minInclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties
+            propertySchema: NodeShape.schema.properties
                 .minLength,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toBigInt()))
@@ -3750,7 +3687,7 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .minLength
                         .path,
@@ -3759,8 +3696,7 @@ export var NodeShape;
         }).chain((minLength) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties
-                .node,
+            propertySchema: NodeShape.schema.properties.node,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toIdentifier()))
                 .map((values) => values.length > 0
@@ -3768,7 +3704,7 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .node
                         .path,
@@ -3777,7 +3713,7 @@ export var NodeShape;
         }).chain((node) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties
+            propertySchema: NodeShape.schema.properties
                 .nodeKind,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toIri([
@@ -3788,13 +3724,12 @@ export var NodeShape;
                 dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
                 dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
             ])))
-                .map((values) => values.length >
-                0
+                .map((values) => values.length > 0
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .nodeKind
                         .path,
@@ -3803,8 +3738,7 @@ export var NodeShape;
         }).chain((nodeKind) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
-                .properties
+            propertySchema: NodeShape.schema.properties
                 .not,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toIdentifier()))
@@ -3812,7 +3746,7 @@ export var NodeShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .not
                     .path,
@@ -3821,7 +3755,7 @@ export var NodeShape;
         }).chain((not) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .or,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3831,7 +3765,7 @@ export var NodeShape;
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .or
                     .path,
@@ -3844,7 +3778,7 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .or
                         .path,
@@ -3853,7 +3787,7 @@ export var NodeShape;
         }).chain((or) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .patterns,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3863,7 +3797,7 @@ export var NodeShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .patterns
                     .path,
@@ -3872,7 +3806,7 @@ export var NodeShape;
         }).chain((patterns) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .properties,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3881,7 +3815,7 @@ export var NodeShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: NodeShape
-                    .$schema
+                    .schema
                     .properties
                     .properties
                     .path,
@@ -3890,7 +3824,7 @@ export var NodeShape;
         }).chain((properties) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .subClassOf,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3899,7 +3833,7 @@ export var NodeShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: NodeShape
-                    .$schema
+                    .schema
                     .properties
                     .subClassOf
                     .path,
@@ -3908,7 +3842,7 @@ export var NodeShape;
         }).chain((subClassOf) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .types,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3917,7 +3851,7 @@ export var NodeShape;
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
                 propertyPath: NodeShape
-                    .$schema
+                    .schema
                     .properties
                     .types
                     .path,
@@ -3926,7 +3860,7 @@ export var NodeShape;
         }).chain((types) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
+            propertySchema: NodeShape.schema
                 .properties
                 .xone,
             typeFromRdf: (resourceValues) => resourceValues
@@ -3936,7 +3870,7 @@ export var NodeShape;
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
                 propertyPath: PropertyShape
-                    .$schema
+                    .schema
                     .properties
                     .xone
                     .path,
@@ -3949,15 +3883,14 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape
-                        .$schema
+                        .schema
                         .properties
                         .xone
                         .path,
                     value: Maybe.empty(),
                 })),
-        }).map((xone) => ({
+        }).map((xone) => create({
             $identifier,
-            $type,
             and,
             classes,
             closed,
@@ -3988,9 +3921,23 @@ export var NodeShape;
             subClassOf,
             types,
             xone,
-        }))))))))))))))))))))))))))))))))));
+        })))))))))))))))))))))))))))))))));
     };
-    NodeShape.$schema = {
+    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: {
                 kind: "Identifier",
@@ -4273,246 +4220,251 @@ 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://www.w3.org/ns/shacl#flags"), _nodeShape.flags.flatMap((item) => [$literalFactory.string(item)]), 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://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://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($RdfVocabularies.rdfs.subClassOf, _nodeShape.subClassOf.flatMap((item) => [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) => [
+        ]), 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($RdfVocabularies.rdfs.subClassOf, parameters.object.subClassOf.flatMap((item) => [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(),
         });
     }
-    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 = {}));
 export var Shape;
 (function (Shape) {
-    Shape.$filter = (filter, value) => {
+    Shape.$toString = (value) => {
+        if (NodeShape.isNodeShape(value)) {
+            return NodeShape.$toString(value);
+        }
+        if (PropertyShape.isPropertyShape(value)) {
+            return PropertyShape.$toString(value);
+        }
+        throw new Error("unable to serialize to string");
+    };
+    Shape.filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.on?.["NodeShape"] !== undefined &&
             NodeShape.isNodeShape(value)) {
-            if (!NodeShape.$filter(filter.on["NodeShape"], value)) {
+            if (!NodeShape.filter(filter.on["NodeShape"], value)) {
                 return false;
             }
         }
         if (filter.on?.["PropertyShape"] !== undefined &&
             PropertyShape.isPropertyShape(value)) {
-            if (!PropertyShape.$filter(filter.on["PropertyShape"], value)) {
+            if (!PropertyShape.filter(filter.on["PropertyShape"], value)) {
                 return false;
             }
         }
         return true;
     };
-    Shape.$fromRdfResource = (resource, options) => NodeShape.$fromRdfResource(resource, {
+    Shape.fromRdfResource = (resource, options) => NodeShape.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
-    }).altLazy(() => PropertyShape.$fromRdfResource(resource, {
+    }).altLazy(() => PropertyShape.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
     }));
-    Shape.$fromRdfResourceValues = ((values, _options) => values.chain((values) => values.chainMap((value) => {
+    Shape.fromRdfResourceValues = ((values, _options) => values.chain((values) => values.chainMap((value) => {
         const valueAsValues = Right(value.toValues());
-        return NodeShape.$fromRdfResourceValues(valueAsValues, {
+        return NodeShape.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4521,7 +4473,7 @@ export var Shape;
             propertyPath: _options.propertyPath,
             resource: _options.resource,
         })
-            .altLazy(() => PropertyShape.$fromRdfResourceValues(valueAsValues, {
+            .altLazy(() => PropertyShape.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4532,18 +4484,22 @@ export var Shape;
         }))
             .chain((values) => values.head());
     })));
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = Shape.$Identifier || (Shape.$Identifier = {}));
-    Shape.$schema = {
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = Shape.Identifier || (Shape.Identifier = {}));
+    function isShape(object) {
+        return (NodeShape.isNodeShape(object) || PropertyShape.isPropertyShape(object));
+    }
+    Shape.isShape = isShape;
+    Shape.schema = {
         kind: "NamedObjectUnion",
         members: {
-            NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.$schema },
+            NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
             PropertyShape: {
                 discriminantValues: ["PropertyShape"],
-                type: PropertyShape.$schema,
+                type: PropertyShape.schema,
             },
         },
         properties: {
@@ -4774,19 +4730,19 @@ 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");
     };
-    Shape.$toRdfResourceValues = ((value, _options) => {
+    Shape.toRdfResourceValues = ((value, _options) => {
         if (NodeShape.isNodeShape(value)) {
             return [
-                NodeShape.$toRdfResource(value, {
+                NodeShape.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4794,7 +4750,7 @@ export var Shape;
         }
         if (PropertyShape.isPropertyShape(value)) {
             return [
-                PropertyShape.$toRdfResource(value, {
+                PropertyShape.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4802,71 +4758,73 @@ export var Shape;
         }
         throw new Error("unable to serialize to RDF");
     });
-    Shape.$toString = (value) => {
+})(Shape || (Shape = {}));
+export var $Object;
+(function ($Object) {
+    $Object.$toString = (value) => {
         if (NodeShape.isNodeShape(value)) {
             return NodeShape.$toString(value);
         }
+        if (Ontology.isOntology(value)) {
+            return Ontology.$toString(value);
+        }
+        if (PropertyGroup.isPropertyGroup(value)) {
+            return PropertyGroup.$toString(value);
+        }
         if (PropertyShape.isPropertyShape(value)) {
             return PropertyShape.$toString(value);
         }
         throw new Error("unable to serialize to string");
     };
-    function isShape(object) {
-        return (NodeShape.isNodeShape(object) || PropertyShape.isPropertyShape(object));
-    }
-    Shape.isShape = isShape;
-})(Shape || (Shape = {}));
-export var $Object;
-(function ($Object) {
-    $Object.$filter = (filter, value) => {
+    $Object.filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.on?.["NodeShape"] !== undefined &&
             NodeShape.isNodeShape(value)) {
-            if (!NodeShape.$filter(filter.on["NodeShape"], value)) {
+            if (!NodeShape.filter(filter.on["NodeShape"], value)) {
                 return false;
             }
         }
         if (filter.on?.["Ontology"] !== undefined && Ontology.isOntology(value)) {
-            if (!Ontology.$filter(filter.on["Ontology"], value)) {
+            if (!Ontology.filter(filter.on["Ontology"], value)) {
                 return false;
             }
         }
         if (filter.on?.["PropertyGroup"] !== undefined &&
             PropertyGroup.isPropertyGroup(value)) {
-            if (!PropertyGroup.$filter(filter.on["PropertyGroup"], value)) {
+            if (!PropertyGroup.filter(filter.on["PropertyGroup"], value)) {
                 return false;
             }
         }
         if (filter.on?.["PropertyShape"] !== undefined &&
             PropertyShape.isPropertyShape(value)) {
-            if (!PropertyShape.$filter(filter.on["PropertyShape"], value)) {
+            if (!PropertyShape.filter(filter.on["PropertyShape"], value)) {
                 return false;
             }
         }
         return true;
     };
-    $Object.$fromRdfResource = (resource, options) => NodeShape.$fromRdfResource(resource, {
+    $Object.fromRdfResource = (resource, options) => NodeShape.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
     })
-        .altLazy(() => Ontology.$fromRdfResource(resource, {
+        .altLazy(() => Ontology.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
     }))
-        .altLazy(() => PropertyGroup.$fromRdfResource(resource, {
+        .altLazy(() => PropertyGroup.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
     }))
-        .altLazy(() => PropertyShape.$fromRdfResource(resource, {
+        .altLazy(() => PropertyShape.fromRdfResource(resource, {
         ...options,
         ignoreRdfType: false,
     }));
-    $Object.$fromRdfResourceValues = ((values, _options) => values.chain((values) => values.chainMap((value) => {
+    $Object.fromRdfResourceValues = ((values, _options) => values.chain((values) => values.chainMap((value) => {
         const valueAsValues = Right(value.toValues());
-        return NodeShape.$fromRdfResourceValues(valueAsValues, {
+        return NodeShape.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4875,7 +4833,7 @@ export var $Object;
             propertyPath: _options.propertyPath,
             resource: _options.resource,
         })
-            .altLazy(() => Ontology.$fromRdfResourceValues(valueAsValues, {
+            .altLazy(() => Ontology.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4884,7 +4842,7 @@ export var $Object;
             propertyPath: _options.propertyPath,
             resource: _options.resource,
         }))
-            .altLazy(() => PropertyGroup.$fromRdfResourceValues(valueAsValues, {
+            .altLazy(() => PropertyGroup.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4893,7 +4851,7 @@ export var $Object;
             propertyPath: _options.propertyPath,
             resource: _options.resource,
         }))
-            .altLazy(() => PropertyShape.$fromRdfResourceValues(valueAsValues, {
+            .altLazy(() => PropertyShape.fromRdfResourceValues(valueAsValues, {
             context: _options.context,
             graph: _options.graph,
             ignoreRdfType: false,
@@ -4904,23 +4862,23 @@ export var $Object;
         }))
             .chain((values) => values.head());
     })));
-    let $Identifier;
-    (function ($Identifier) {
-        $Identifier.parse = $parseIdentifier;
-        $Identifier.stringify = NTriplesTerm.stringify;
-    })($Identifier = $Object.$Identifier || ($Object.$Identifier = {}));
-    $Object.$schema = {
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+        Identifier.stringify = NTriplesTerm.stringify;
+    })(Identifier = $Object.Identifier || ($Object.Identifier = {}));
+    $Object.schema = {
         kind: "NamedObjectUnion",
         members: {
-            NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.$schema },
-            Ontology: { discriminantValues: ["Ontology"], type: Ontology.$schema },
+            NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
+            Ontology: { discriminantValues: ["Ontology"], type: Ontology.schema },
             PropertyGroup: {
                 discriminantValues: ["PropertyGroup"],
-                type: PropertyGroup.$schema,
+                type: PropertyGroup.schema,
             },
             PropertyShape: {
                 discriminantValues: ["PropertyShape"],
-                type: PropertyShape.$schema,
+                type: PropertyShape.schema,
             },
         },
         properties: {
@@ -4942,25 +4900,25 @@ 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");
     };
-    $Object.$toRdfResourceValues = ((value, _options) => {
+    $Object.toRdfResourceValues = ((value, _options) => {
         if (NodeShape.isNodeShape(value)) {
             return [
-                NodeShape.$toRdfResource(value, {
+                NodeShape.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4968,7 +4926,7 @@ export var $Object;
         }
         if (Ontology.isOntology(value)) {
             return [
-                Ontology.$toRdfResource(value, {
+                Ontology.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4976,7 +4934,7 @@ export var $Object;
         }
         if (PropertyGroup.isPropertyGroup(value)) {
             return [
-                PropertyGroup.$toRdfResource(value, {
+                PropertyGroup.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4984,7 +4942,7 @@ export var $Object;
         }
         if (PropertyShape.isPropertyShape(value)) {
             return [
-                PropertyShape.$toRdfResource(value, {
+                PropertyShape.toRdfResource(value, {
                     graph: _options.graph,
                     resourceSet: _options.resourceSet,
                 }).identifier,
@@ -4992,28 +4950,13 @@ export var $Object;
         }
         throw new Error("unable to serialize to RDF");
     });
-    $Object.$toString = (value) => {
-        if (NodeShape.isNodeShape(value)) {
-            return NodeShape.$toString(value);
-        }
-        if (Ontology.isOntology(value)) {
-            return Ontology.$toString(value);
-        }
-        if (PropertyGroup.isPropertyGroup(value)) {
-            return PropertyGroup.$toString(value);
-        }
-        if (PropertyShape.isPropertyShape(value)) {
-            return PropertyShape.$toString(value);
-        }
-        throw new Error("unable to serialize to string");
-    };
 })($Object || ($Object = {}));
 export class $RdfjsDatasetObjectSet {
-    $graph;
     #dataset;
+    #graph;
     constructor(dataset, options) {
         this.#dataset = dataset;
-        this.$graph = options?.graph;
+        this.#graph = options?.graph;
     }
     $dataset() {
         if (typeof this.#dataset === "object") {
@@ -5053,9 +4996,9 @@ export class $RdfjsDatasetObjectSet {
     }
     nodeShapesSync(query) {
         return this.#objectsSync({
-            $filter: NodeShape.$filter,
-            $fromRdfResource: NodeShape.$fromRdfResource,
-            $fromRdfTypes: [NodeShape.$fromRdfType],
+            filter: NodeShape.filter,
+            fromRdfResource: NodeShape.fromRdfResource,
+            fromRdfTypes: [NodeShape.fromRdfType],
         }, query);
     }
     async ontology(identifier, options) {
@@ -5084,9 +5027,9 @@ export class $RdfjsDatasetObjectSet {
     }
     ontologiesSync(query) {
         return this.#objectsSync({
-            $filter: Ontology.$filter,
-            $fromRdfResource: Ontology.$fromRdfResource,
-            $fromRdfTypes: [Ontology.$fromRdfType],
+            filter: Ontology.filter,
+            fromRdfResource: Ontology.fromRdfResource,
+            fromRdfTypes: [Ontology.fromRdfType],
         }, query);
     }
     async propertyGroup(identifier, options) {
@@ -5115,9 +5058,9 @@ export class $RdfjsDatasetObjectSet {
     }
     propertyGroupsSync(query) {
         return this.#objectsSync({
-            $filter: PropertyGroup.$filter,
-            $fromRdfResource: PropertyGroup.$fromRdfResource,
-            $fromRdfTypes: [PropertyGroup.$fromRdfType],
+            filter: PropertyGroup.filter,
+            fromRdfResource: PropertyGroup.fromRdfResource,
+            fromRdfTypes: [PropertyGroup.fromRdfType],
         }, query);
     }
     async propertyShape(identifier, options) {
@@ -5146,9 +5089,9 @@ export class $RdfjsDatasetObjectSet {
     }
     propertyShapesSync(query) {
         return this.#objectsSync({
-            $filter: PropertyShape.$filter,
-            $fromRdfResource: PropertyShape.$fromRdfResource,
-            $fromRdfTypes: [PropertyShape.$fromRdfType],
+            filter: PropertyShape.filter,
+            fromRdfResource: PropertyShape.fromRdfResource,
+            fromRdfTypes: [PropertyShape.fromRdfType],
         }, query);
     }
     async shape(identifier, options) {
@@ -5178,14 +5121,14 @@ export class $RdfjsDatasetObjectSet {
     shapesSync(query) {
         return this.#objectUnionsSync([
             {
-                $filter: Shape.$filter,
-                $fromRdfResource: NodeShape.$fromRdfResource,
-                $fromRdfTypes: [NodeShape.$fromRdfType],
+                filter: Shape.filter,
+                fromRdfResource: NodeShape.fromRdfResource,
+                fromRdfTypes: [NodeShape.fromRdfType],
             },
             {
-                $filter: Shape.$filter,
-                $fromRdfResource: PropertyShape.$fromRdfResource,
-                $fromRdfTypes: [PropertyShape.$fromRdfType],
+                filter: Shape.filter,
+                fromRdfResource: PropertyShape.fromRdfResource,
+                fromRdfTypes: [PropertyShape.fromRdfType],
             },
         ], query);
     }
@@ -5216,29 +5159,29 @@ export class $RdfjsDatasetObjectSet {
     $objectsSync(query) {
         return this.#objectUnionsSync([
             {
-                $filter: $Object.$filter,
-                $fromRdfResource: NodeShape.$fromRdfResource,
-                $fromRdfTypes: [NodeShape.$fromRdfType],
+                filter: $Object.filter,
+                fromRdfResource: NodeShape.fromRdfResource,
+                fromRdfTypes: [NodeShape.fromRdfType],
             },
             {
-                $filter: $Object.$filter,
-                $fromRdfResource: Ontology.$fromRdfResource,
-                $fromRdfTypes: [Ontology.$fromRdfType],
+                filter: $Object.filter,
+                fromRdfResource: Ontology.fromRdfResource,
+                fromRdfTypes: [Ontology.fromRdfType],
             },
             {
-                $filter: $Object.$filter,
-                $fromRdfResource: PropertyGroup.$fromRdfResource,
-                $fromRdfTypes: [PropertyGroup.$fromRdfType],
+                filter: $Object.filter,
+                fromRdfResource: PropertyGroup.fromRdfResource,
+                fromRdfTypes: [PropertyGroup.fromRdfType],
             },
             {
-                $filter: $Object.$filter,
-                $fromRdfResource: PropertyShape.$fromRdfResource,
-                $fromRdfTypes: [PropertyShape.$fromRdfType],
+                filter: $Object.filter,
+                fromRdfResource: PropertyShape.fromRdfResource,
+                fromRdfTypes: [PropertyShape.fromRdfType],
             },
         ], query);
     }
     #objectsSync(namedObjectType, query) {
-        const graph = query?.graph ?? this.$graph;
+        const graph = query?.graph ?? this.#graph;
         const limit = query?.limit ?? Number.MAX_SAFE_INTEGER;
         if (limit <= 0) {
             return Right([]);
@@ -5261,11 +5204,11 @@ export class $RdfjsDatasetObjectSet {
             }));
             sortResources = false;
         }
-        else if (namedObjectType.$fromRdfTypes.length > 0) {
+        else if (namedObjectType.fromRdfTypes.length > 0) {
             const identifierSet = new $IdentifierSet();
             resources = [];
             sortResources = true;
-            for (const fromRdfType of namedObjectType.$fromRdfTypes) {
+            for (const fromRdfType of namedObjectType.fromRdfTypes) {
                 for (const resource of resourceSet.instancesOf(fromRdfType, {
                     graph,
                 })) {
@@ -5298,7 +5241,7 @@ export class $RdfjsDatasetObjectSet {
                 const resource = resourceSet.resource(quad.subject);
                 // Eagerly eliminate the majority of resources that won't match the object type
                 namedObjectType
-                    .$fromRdfResource(resource, fromRdfResourceOptions)
+                    .fromRdfResource(resource, fromRdfResourceOptions)
                     .ifRight((object) => {
                     resources.push({ object, resource });
                 });
@@ -5312,13 +5255,13 @@ export class $RdfjsDatasetObjectSet {
         const objects = [];
         for (let { object, resource } of resources) {
             if (!object) {
-                const objectEither = namedObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
+                const objectEither = namedObjectType.fromRdfResource(resource, fromRdfResourceOptions);
                 if (objectEither.isLeft()) {
                     return objectEither;
                 }
                 object = objectEither.unsafeCoerce();
             }
-            if (query?.filter && !namedObjectType.$filter(query.filter, object)) {
+            if (query?.filter && !namedObjectType.filter(query.filter, object)) {
                 continue;
             }
             if (objectI++ >= offset) {
@@ -5331,7 +5274,7 @@ export class $RdfjsDatasetObjectSet {
         return Right(objects);
     }
     #objectUnionsSync(namedObjectTypes, query) {
-        const graph = query?.graph ?? this.$graph;
+        const graph = query?.graph ?? this.#graph;
         const limit = query?.limit ?? Number.MAX_SAFE_INTEGER;
         if (limit <= 0) {
             return Right([]);
@@ -5354,12 +5297,12 @@ export class $RdfjsDatasetObjectSet {
             }));
             sortResources = false;
         }
-        else if (namedObjectTypes.every((namedObjectType) => namedObjectType.$fromRdfTypes.length > 0)) {
+        else if (namedObjectTypes.every((namedObjectType) => namedObjectType.fromRdfTypes.length > 0)) {
             const identifierSet = new $IdentifierSet();
             resources = [];
             sortResources = true;
             for (const namedObjectType of namedObjectTypes) {
-                for (const fromRdfType of namedObjectType.$fromRdfTypes) {
+                for (const fromRdfType of namedObjectType.fromRdfTypes) {
                     for (const resource of resourceSet.instancesOf(fromRdfType, {
                         graph,
                     })) {
@@ -5394,7 +5337,7 @@ export class $RdfjsDatasetObjectSet {
                 const resource = resourceSet.resource(quad.subject);
                 for (const namedObjectType of namedObjectTypes) {
                     if (namedObjectType
-                        .$fromRdfResource(resource, fromRdfResourceOptions)
+                        .fromRdfResource(resource, fromRdfResourceOptions)
                         .ifRight((object) => {
                         resources.push({ object, namedObjectType, resource });
                     })
@@ -5414,12 +5357,12 @@ export class $RdfjsDatasetObjectSet {
             if (!object) {
                 let objectEither;
                 if (namedObjectType) {
-                    objectEither = namedObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
+                    objectEither = namedObjectType.fromRdfResource(resource, fromRdfResourceOptions);
                 }
                 else {
                     objectEither = Left(new Error("no object types"));
                     for (const tryObjectType of namedObjectTypes) {
-                        objectEither = tryObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
+                        objectEither = tryObjectType.fromRdfResource(resource, fromRdfResourceOptions);
                         if (objectEither.isRight()) {
                             namedObjectType = tryObjectType;
                             break;
@@ -5434,7 +5377,7 @@ export class $RdfjsDatasetObjectSet {
             if (!namedObjectType) {
                 throw new Error("namedObjectType should be set here");
             }
-            if (query?.filter && !namedObjectType.$filter(query.filter, object)) {
+            if (query?.filter && !namedObjectType.filter(query.filter, object)) {
                 continue;
             }
             if (objectI++ >= offset) {