@shaclmate/compiler 4.0.96 → 4.0.98

package/dist/input/input.shaclmate.js

@@ -375,393 +375,293 @@ const $xsd_double = dataFactory.namedNode("http://www.w3.org/2001/XMLSchema#doub
 const $xsd_int = dataFactory.namedNode("http://www.w3.org/2001/XMLSchema#int");
 const $xsd_integer = dataFactory.namedNode("http://www.w3.org/2001/XMLSchema#integer");
 const $xsd_string = dataFactory.namedNode("http://www.w3.org/2001/XMLSchema#string");
-export var NodeShape;
-(function (NodeShape) {
-    NodeShape._fromRdfResource = (resource, options) => $sequenceRecord({
+export var BaseShape;
+(function (BaseShape) {
+    BaseShape._fromRdfResource = (resource, options) => $sequenceRecord({
         $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
             ...options,
             focusResource: resource,
             propertyPath: $rdf_subject,
-            schema: NodeShape.schema.properties.$identifier.type,
+            schema: BaseShape.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
-        $rdfType: !options.ignoreRdfType
-            ? $ensureRdfResourceType(resource, [NodeShape.schema.properties.$rdfType.fromRdfType], {
-                graph: options.graph,
-            })
-            : Right(true),
         and: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.and,
+            propertySchema: BaseShape.schema.properties.and,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         classes: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.classes,
+            propertySchema: BaseShape.schema.properties.classes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
-        closed: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.closed,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
         comment: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
+            propertySchema: BaseShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         datatype: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.datatype,
+            propertySchema: BaseShape.schema.properties.datatype,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         deactivated: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.deactivated,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
-        discriminantValue: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.discriminantValue,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        extern: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.extern,
+            propertySchema: BaseShape.schema.properties.deactivated,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         flags: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.flags,
+            propertySchema: BaseShape.schema.properties.flags,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
-        fromRdfType: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.fromRdfType,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
         hasValues: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.hasValues,
+            propertySchema: BaseShape.schema.properties.hasValues,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         ignore: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.ignore,
+            propertySchema: BaseShape.schema.properties.ignore,
             typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
-        ignoredProperties: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.ignoredProperties,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($iriFromRdfResourceValues))),
-        }),
         in_: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.in_,
+            propertySchema: BaseShape.schema.properties.in_,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($termFromRdfResourceValues))),
         }),
         isDefinedBy: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.isDefinedBy,
+            propertySchema: BaseShape.schema.properties.isDefinedBy,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         label: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: BaseShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         languageIn: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.languageIn,
+            propertySchema: BaseShape.schema.properties.languageIn,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($stringFromRdfResourceValues))),
         }),
         maxExclusive: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxExclusive,
+            propertySchema: BaseShape.schema.properties.maxExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxInclusive: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxInclusive,
+            propertySchema: BaseShape.schema.properties.maxInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         maxLength: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxLength,
+            propertySchema: BaseShape.schema.properties.maxLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         message: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.message,
+            propertySchema: BaseShape.schema.properties.message,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         minExclusive: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minExclusive,
+            propertySchema: BaseShape.schema.properties.minExclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minInclusive: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minInclusive,
+            propertySchema: BaseShape.schema.properties.minInclusive,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
         }),
         minLength: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minLength,
+            propertySchema: BaseShape.schema.properties.minLength,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
         mutable: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.mutable,
+            propertySchema: BaseShape.schema.properties.mutable,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         node: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.node,
+            propertySchema: BaseShape.schema.properties.node,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         nodeKind: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.nodeKind,
+            propertySchema: BaseShape.schema.properties.nodeKind,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         not: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.not,
+            propertySchema: BaseShape.schema.properties.not,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         or: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.or,
+            propertySchema: BaseShape.schema.properties.or,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
         pattern: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.pattern,
+            propertySchema: BaseShape.schema.properties.pattern,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
-        properties: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.properties,
-            typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
-        }),
-        rdfType: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.rdfType,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
         severity: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.severity,
+            propertySchema: BaseShape.schema.properties.severity,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         shaclmateName: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.shaclmateName,
+            propertySchema: BaseShape.schema.properties.shaclmateName,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
-        subClassOf: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.subClassOf,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
         targetClasses: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetClasses,
+            propertySchema: BaseShape.schema.properties.targetClasses,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetNodes: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetNodes,
+            propertySchema: BaseShape.schema.properties.targetNodes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         targetObjectsOf: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetObjectsOf,
+            propertySchema: BaseShape.schema.properties.targetObjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         targetSubjectsOf: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetSubjectsOf,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        toRdfTypes: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.toRdfTypes,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        tsImports: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.tsImports,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        types: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.types,
+            propertySchema: BaseShape.schema.properties.targetSubjectsOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         xone: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.xone,
+            propertySchema: BaseShape.schema.properties.xone,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
         }),
-    }).chain((properties) => NodeShape.create(properties));
-    NodeShape.$toString = (_nodeShape) => `NodeShape(${JSON.stringify(NodeShape.toStringRecord(_nodeShape))})`;
-    NodeShape.create = (parameters = {}) => $sequenceRecord({
+    }).chain((properties) => BaseShape.create(properties));
+    BaseShape.$toString = (_baseShape) => `BaseShape(${JSON.stringify(BaseShape.toStringRecord(_baseShape))})`;
+    BaseShape.create = (parameters = {}) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
-        $type: Right("NodeShape"),
-        and: $convertToMaybe($convertToList($convertToIdentifier))(parameters.and, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.and.type, value)),
-        classes: $convertToScalarSet($convertToIri)(parameters.classes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.classes.type, value)),
-        closed: $convertToMaybe($identityConversionFunction)(parameters.closed, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.closed.type, value)),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        datatype: $convertToMaybe($convertToIri)(parameters.datatype, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.datatype.type, value)),
-        deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.deactivated.type, value)),
-        discriminantValue: $convertToMaybe($identityConversionFunction)(parameters.discriminantValue, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.discriminantValue.type, value)),
-        extern: $convertToMaybe($identityConversionFunction)(parameters.extern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.extern.type, value)),
-        flags: $convertToMaybe($identityConversionFunction)(parameters.flags, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.flags.type, value)),
-        fromRdfType: $convertToMaybe($convertToIri)(parameters.fromRdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.fromRdfType.type, value)),
-        hasValues: $convertToScalarSet($identityConversionFunction)(parameters.hasValues, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.hasValues.type, value)),
+        $type: Right("BaseShape"),
+        and: $convertToMaybe($convertToList($convertToIdentifier))(parameters.and, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(BaseShape.schema.properties.and.type, value)),
+        classes: $convertToScalarSet($convertToIri)(parameters.classes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.classes.type, value)),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
+        datatype: $convertToMaybe($convertToIri)(parameters.datatype, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.datatype.type, value)),
+        deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.deactivated.type, value)),
+        flags: $convertToMaybe($identityConversionFunction)(parameters.flags, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.flags.type, value)),
+        hasValues: $convertToScalarSet($identityConversionFunction)(parameters.hasValues, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.hasValues.type, value)),
         ignore: $convertWithDefaultValue($identityConversionFunction, false)(parameters.ignore, parameters.$defaultNamespace),
-        ignoredProperties: $convertToMaybe($convertToList($convertToIri))(parameters.ignoredProperties, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.ignoredProperties.type, value)),
-        in_: $convertToMaybe($convertToList($identityConversionFunction))(parameters.in_, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.in_.type, value)),
-        isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.isDefinedBy.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
-        languageIn: $convertToMaybe($convertToList($identityConversionFunction))(parameters.languageIn, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.languageIn.type, value)),
-        maxExclusive: $convertToMaybe($convertToLiteral)(parameters.maxExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxExclusive.type, value)),
-        maxInclusive: $convertToMaybe($convertToLiteral)(parameters.maxInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxInclusive.type, value)),
-        maxLength: $convertToMaybe($convertToBigInt)(parameters.maxLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxLength.type, value)),
-        message: $convertToMaybe($identityConversionFunction)(parameters.message, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.message.type, value)),
-        minExclusive: $convertToMaybe($convertToLiteral)(parameters.minExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minExclusive.type, value)),
-        minInclusive: $convertToMaybe($convertToLiteral)(parameters.minInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minInclusive.type, value)),
-        minLength: $convertToMaybe($convertToBigInt)(parameters.minLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minLength.type, value)),
-        mutable: $convertToMaybe($identityConversionFunction)(parameters.mutable, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.mutable.type, value)),
-        node: $convertToMaybe($convertToIdentifier)(parameters.node, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.node.type, value)),
-        nodeKind: $convertToMaybe(($convertToInIri))(parameters.nodeKind, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.nodeKind.type, value)),
-        not: $convertToScalarSet($convertToIdentifier)(parameters.not, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.not.type, value)),
-        or: $convertToMaybe($convertToList($convertToIdentifier))(parameters.or, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.or.type, value)),
-        pattern: $convertToMaybe($identityConversionFunction)(parameters.pattern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.pattern.type, value)),
-        properties: $convertToScalarSet($convertToIdentifier)(parameters.properties, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.properties.type, value)),
-        rdfType: $convertToMaybe($convertToIri)(parameters.rdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.rdfType.type, value)),
-        severity: $convertToMaybe(($convertToInIri))(parameters.severity, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.severity.type, value)),
-        shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.shaclmateName.type, value)),
-        subClassOf: $convertToScalarSet($convertToIri)(parameters.subClassOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.subClassOf.type, value)),
-        targetClasses: $convertToScalarSet($convertToIri)(parameters.targetClasses, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetClasses.type, value)),
-        targetNodes: $convertToScalarSet($identityConversionFunction)(parameters.targetNodes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetNodes.type, value)),
-        targetObjectsOf: $convertToScalarSet($convertToIri)(parameters.targetObjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetObjectsOf.type, value)),
-        targetSubjectsOf: $convertToScalarSet($convertToIri)(parameters.targetSubjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetSubjectsOf.type, value)),
-        toRdfTypes: $convertToScalarSet($convertToIri)(parameters.toRdfTypes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.toRdfTypes.type, value)),
-        tsImports: $convertToScalarSet($identityConversionFunction)(parameters.tsImports, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.tsImports.type, value)),
-        types: $convertToScalarSet($convertToIri)(parameters.types, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.types.type, value)),
-        xone: $convertToMaybe($convertToList($convertToIdentifier))(parameters.xone, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.xone.type, value)),
-    }).map((object) => $monkeyPatchObject(object, { $toString: NodeShape.$toString }));
-    NodeShape.createUnsafe = (parameters) => NodeShape.create(parameters).unsafeCoerce();
-    NodeShape.fromRdfResource = $wrap_FromRdfResourceFunction(NodeShape._fromRdfResource);
-    NodeShape.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        in_: $convertToMaybe($convertToList($identityConversionFunction))(parameters.in_, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(BaseShape.schema.properties.in_.type, value)),
+        isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.isDefinedBy.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
+        languageIn: $convertToMaybe($convertToList($identityConversionFunction))(parameters.languageIn, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(BaseShape.schema.properties.languageIn.type, value)),
+        maxExclusive: $convertToMaybe($convertToLiteral)(parameters.maxExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.maxExclusive.type, value)),
+        maxInclusive: $convertToMaybe($convertToLiteral)(parameters.maxInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.maxInclusive.type, value)),
+        maxLength: $convertToMaybe($convertToBigInt)(parameters.maxLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.maxLength.type, value)),
+        message: $convertToMaybe($identityConversionFunction)(parameters.message, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.message.type, value)),
+        minExclusive: $convertToMaybe($convertToLiteral)(parameters.minExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.minExclusive.type, value)),
+        minInclusive: $convertToMaybe($convertToLiteral)(parameters.minInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.minInclusive.type, value)),
+        minLength: $convertToMaybe($convertToBigInt)(parameters.minLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.minLength.type, value)),
+        mutable: $convertToMaybe($identityConversionFunction)(parameters.mutable, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.mutable.type, value)),
+        node: $convertToMaybe($convertToIdentifier)(parameters.node, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.node.type, value)),
+        nodeKind: $convertToMaybe(($convertToInIri))(parameters.nodeKind, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.nodeKind.type, value)),
+        not: $convertToScalarSet($convertToIdentifier)(parameters.not, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.not.type, value)),
+        or: $convertToMaybe($convertToList($convertToIdentifier))(parameters.or, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(BaseShape.schema.properties.or.type, value)),
+        pattern: $convertToMaybe($identityConversionFunction)(parameters.pattern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.pattern.type, value)),
+        severity: $convertToMaybe(($convertToInIri))(parameters.severity, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.severity.type, value)),
+        shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.shaclmateName.type, value)),
+        targetClasses: $convertToScalarSet($convertToIri)(parameters.targetClasses, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.targetClasses.type, value)),
+        targetNodes: $convertToScalarSet($identityConversionFunction)(parameters.targetNodes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.targetNodes.type, value)),
+        targetObjectsOf: $convertToScalarSet($convertToIri)(parameters.targetObjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.targetObjectsOf.type, value)),
+        targetSubjectsOf: $convertToScalarSet($convertToIri)(parameters.targetSubjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.targetSubjectsOf.type, value)),
+        xone: $convertToMaybe($convertToList($convertToIdentifier))(parameters.xone, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(BaseShape.schema.properties.xone.type, value)),
+    }).map((object) => $monkeyPatchObject(object, { $toString: BaseShape.$toString }));
+    BaseShape.createUnsafe = (parameters) => BaseShape.create(parameters).unsafeCoerce();
+    BaseShape.fromRdfResource = $wrap_FromRdfResourceFunction(BaseShape._fromRdfResource);
+    BaseShape.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
         .toResource()
-        .chain((resource) => NodeShape.fromRdfResource(resource, options)));
+        .chain((resource) => BaseShape.fromRdfResource(resource, options)));
     let Identifier;
     (function (Identifier) {
         Identifier.parse = $parseIdentifier;
-    })(Identifier = NodeShape.Identifier || (NodeShape.Identifier = {}));
-    NodeShape.isNodeShape = (object) => object.$type === "NodeShape";
-    NodeShape.schema = {
+    })(Identifier = BaseShape.Identifier || (BaseShape.Identifier = {}));
+    BaseShape.isBaseShape = (object) => object.$type === "BaseShape";
+    BaseShape.schema = {
         properties: {
             $identifier: {
                 kind: "Identifier",
                 type: { kind: "Identifier" },
             },
-            $rdfType: {
-                fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"),
-                kind: "RdfType",
-                toRdfTypes: [
-                    dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"),
-                ],
-            },
             and: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#and"),
@@ -778,14 +678,6 @@ export var NodeShape;
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },
             },
-            closed: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#closed"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
             comment: {
                 kind: "Shacl",
                 path: $rdfs_comment,
@@ -807,22 +699,6 @@ export var NodeShape;
                     itemType: { kind: "Boolean", datatype: $xsd_boolean },
                 },
             },
-            discriminantValue: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#discriminantValue"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            extern: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#extern"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
             flags: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
@@ -831,11 +707,6 @@ export var NodeShape;
                     itemType: { kind: "String", datatype: $xsd_string },
                 },
             },
-            fromRdfType: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#fromRdfType"),
-                type: { kind: "Option", itemType: { kind: "Iri" } },
-            },
             hasValues: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"),
@@ -853,17 +724,6 @@ export var NodeShape;
                     defaultValue: dataFactory.literal("false", $xsd_boolean),
                 },
             },
-            ignoredProperties: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#ignoredProperties"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Iri" },
-                    },
-                },
-            },
             in_: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#in"),
@@ -1022,19 +882,6 @@ export var NodeShape;
                     itemType: { kind: "String", datatype: $xsd_string },
                 },
             },
-            properties: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#property"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            rdfType: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"),
-                type: { kind: "Option", itemType: { kind: "Iri" } },
-            },
             severity: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
@@ -1055,11 +902,6 @@ export var NodeShape;
                     itemType: { kind: "String", datatype: $xsd_string },
                 },
             },
-            subClassOf: {
-                kind: "Shacl",
-                path: $rdfs_subClassOf,
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
             targetClasses: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
@@ -1083,24 +925,6 @@ export var NodeShape;
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },
             },
-            toRdfTypes: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            tsImports: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            types: {
-                kind: "Shacl",
-                path: $rdf_type,
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
             xone: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"),
@@ -1114,82 +938,273 @@ export var NodeShape;
             },
         },
     };
-    NodeShape.toStringRecord = (_nodeShape) => $compactRecord({
-        $identifier: _nodeShape.$identifier().toString(),
-        label: _nodeShape.label.map((item) => item.toString()).extract(),
-        shaclmateName: _nodeShape.shaclmateName
+    BaseShape.toStringRecord = (_baseShape) => $compactRecord({
+        $identifier: _baseShape.$identifier().toString(),
+        label: _baseShape.label.map((item) => item.toString()).extract(),
+        shaclmateName: _baseShape.shaclmateName
             .map((item) => item.toString())
             .extract(),
     });
-})(NodeShape || (NodeShape = {}));
-export var Ontology;
-(function (Ontology) {
-    Ontology._fromRdfResource = (resource, options) => $sequenceRecord({
+})(BaseShape || (BaseShape = {}));
+export var NodeShapeSpecificProperties;
+(function (NodeShapeSpecificProperties) {
+    NodeShapeSpecificProperties._fromRdfResource = (resource, options) => $sequenceRecord({
         $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
             ...options,
             focusResource: resource,
             propertyPath: $rdf_subject,
-            schema: Ontology.schema.properties.$identifier.type,
+            schema: NodeShapeSpecificProperties.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
-        $rdfType: !options.ignoreRdfType
-            ? $ensureRdfResourceType(resource, [Ontology.schema.properties.$rdfType.fromRdfType], {
-                graph: options.graph,
-            })
-            : Right(true),
-        comment: $shaclPropertyFromRdf({
+        closed: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
+            propertySchema: NodeShapeSpecificProperties.schema.properties.closed,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
-        label: $shaclPropertyFromRdf({
+        discriminantValue: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.discriminantValue,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
-    }).chain((properties) => Ontology.create(properties));
-    Ontology.$toString = (_ontology) => `Ontology(${JSON.stringify(Ontology.toStringRecord(_ontology))})`;
-    Ontology.create = (parameters = {}) => $sequenceRecord({
+        extern: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.extern,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
+        }),
+        fromRdfType: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.fromRdfType,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
+        }),
+        ignoredProperties: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.ignoredProperties,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($iriFromRdfResourceValues))),
+        }),
+        properties: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.properties,
+            typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
+        }),
+        rdfType: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.rdfType,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
+        }),
+        subClassOf: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.subClassOf,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
+        }),
+        toRdfTypes: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.toRdfTypes,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
+        }),
+        tsImports: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.tsImports,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(($stringFromRdfResourceValues)),
+        }),
+        types: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.types,
+            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
+        }),
+    }).chain((properties) => NodeShapeSpecificProperties.create(properties));
+    NodeShapeSpecificProperties.$toString = (_nodeShapeSpecificProperties) => `NodeShapeSpecificProperties(${JSON.stringify(NodeShapeSpecificProperties.toStringRecord(_nodeShapeSpecificProperties))})`;
+    NodeShapeSpecificProperties.create = (parameters = {}) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
-        $type: Right("Ontology"),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
-    }).map((object) => $monkeyPatchObject(object, { $toString: Ontology.$toString }));
-    Ontology.createUnsafe = (parameters) => Ontology.create(parameters).unsafeCoerce();
-    Ontology.fromRdfResource = $wrap_FromRdfResourceFunction(Ontology._fromRdfResource);
-    Ontology.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        $type: Right("NodeShapeSpecificProperties"),
+        closed: $convertToMaybe($identityConversionFunction)(parameters.closed, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.closed.type, value)),
+        discriminantValue: $convertToMaybe($identityConversionFunction)(parameters.discriminantValue, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.discriminantValue.type, value)),
+        extern: $convertToMaybe($identityConversionFunction)(parameters.extern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.extern.type, value)),
+        fromRdfType: $convertToMaybe($convertToIri)(parameters.fromRdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.fromRdfType.type, value)),
+        ignoredProperties: $convertToMaybe($convertToList($convertToIri))(parameters.ignoredProperties, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShapeSpecificProperties.schema.properties.ignoredProperties.type, value)),
+        properties: $convertToScalarSet($convertToIdentifier)(parameters.properties, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.properties.type, value)),
+        rdfType: $convertToMaybe($convertToIri)(parameters.rdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.rdfType.type, value)),
+        subClassOf: $convertToScalarSet($convertToIri)(parameters.subClassOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.subClassOf.type, value)),
+        toRdfTypes: $convertToScalarSet($convertToIri)(parameters.toRdfTypes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.toRdfTypes.type, value)),
+        tsImports: $convertToScalarSet($identityConversionFunction)(parameters.tsImports, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.tsImports.type, value)),
+        types: $convertToScalarSet($convertToIri)(parameters.types, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.types.type, value)),
+    }).map((object) => $monkeyPatchObject(object, {
+        $toString: NodeShapeSpecificProperties.$toString,
+    }));
+    NodeShapeSpecificProperties.createUnsafe = (parameters) => NodeShapeSpecificProperties.create(parameters).unsafeCoerce();
+    NodeShapeSpecificProperties.fromRdfResource = $wrap_FromRdfResourceFunction(NodeShapeSpecificProperties._fromRdfResource);
+    NodeShapeSpecificProperties.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
         .toResource()
-        .chain((resource) => Ontology.fromRdfResource(resource, options)));
+        .chain((resource) => NodeShapeSpecificProperties.fromRdfResource(resource, options)));
     let Identifier;
     (function (Identifier) {
         Identifier.parse = $parseIdentifier;
-    })(Identifier = Ontology.Identifier || (Ontology.Identifier = {}));
-    Ontology.isOntology = (object) => object.$type === "Ontology";
-    Ontology.schema = {
+    })(Identifier = NodeShapeSpecificProperties.Identifier || (NodeShapeSpecificProperties.Identifier = {}));
+    NodeShapeSpecificProperties.isNodeShapeSpecificProperties = (object) => object.$type === "NodeShapeSpecificProperties";
+    NodeShapeSpecificProperties.schema = {
         properties: {
             $identifier: {
                 kind: "Identifier",
                 type: { kind: "Identifier" },
             },
-            $rdfType: {
-                fromRdfType: dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"),
-                kind: "RdfType",
-                toRdfTypes: [
-                    dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"),
-                ],
-            },
-            comment: {
+            closed: {
                 kind: "Shacl",
-                path: $rdfs_comment,
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#closed"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
+                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
                 },
             },
-            label: {
+            discriminantValue: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#discriminantValue"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String", datatype: $xsd_string },
+                },
+            },
+            extern: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#extern"),
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
+                },
+            },
+            fromRdfType: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#fromRdfType"),
+                type: { kind: "Option", itemType: { kind: "Iri" } },
+            },
+            ignoredProperties: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#ignoredProperties"),
+                type: {
+                    kind: "Option",
+                    itemType: {
+                        kind: "List",
+                        itemType: { kind: "Iri" },
+                    },
+                },
+            },
+            properties: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#property"),
+                type: {
+                    kind: "Set",
+                    itemType: { kind: "Identifier" },
+                },
+            },
+            rdfType: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"),
+                type: { kind: "Option", itemType: { kind: "Iri" } },
+            },
+            subClassOf: {
+                kind: "Shacl",
+                path: $rdfs_subClassOf,
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            toRdfTypes: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+            tsImports: {
+                kind: "Shacl",
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"),
+                type: {
+                    kind: "Set",
+                    itemType: { kind: "String", datatype: $xsd_string },
+                },
+            },
+            types: {
+                kind: "Shacl",
+                path: $rdf_type,
+                type: { kind: "Set", itemType: { kind: "Iri" } },
+            },
+        },
+    };
+    NodeShapeSpecificProperties.toStringRecord = (_nodeShapeSpecificProperties) => $compactRecord({
+        $identifier: _nodeShapeSpecificProperties.$identifier().toString(),
+    });
+})(NodeShapeSpecificProperties || (NodeShapeSpecificProperties = {}));
+export var Ontology;
+(function (Ontology) {
+    Ontology._fromRdfResource = (resource, options) => $sequenceRecord({
+        $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
+            ...options,
+            focusResource: resource,
+            propertyPath: $rdf_subject,
+            schema: Ontology.schema.properties.$identifier.type,
+        }).chain((values) => values.head()),
+        comment: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: BaseShape.schema.properties.comment,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
+        }),
+        label: $shaclPropertyFromRdf({
+            ...options,
+            focusResource: resource,
+            ignoreRdfType: true,
+            propertySchema: BaseShape.schema.properties.label,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
+        }),
+    }).chain((properties) => Ontology.create(properties));
+    Ontology.$toString = (_ontology) => `Ontology(${JSON.stringify(Ontology.toStringRecord(_ontology))})`;
+    Ontology.create = (parameters = {}) => $sequenceRecord({
+        $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
+        $type: Right("Ontology"),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
+    }).map((object) => $monkeyPatchObject(object, { $toString: Ontology.$toString }));
+    Ontology.createUnsafe = (parameters) => Ontology.create(parameters).unsafeCoerce();
+    Ontology.fromRdfResource = $wrap_FromRdfResourceFunction(Ontology._fromRdfResource);
+    Ontology.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => Ontology.fromRdfResource(resource, options)));
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+    })(Identifier = Ontology.Identifier || (Ontology.Identifier = {}));
+    Ontology.isOntology = (object) => object.$type === "Ontology";
+    Ontology.schema = {
+        properties: {
+            $identifier: {
+                kind: "Identifier",
+                type: { kind: "Identifier" },
+            },
+            comment: {
+                kind: "Shacl",
+                path: $rdfs_comment,
+                type: {
+                    kind: "Option",
+                    itemType: { kind: "String", datatype: $xsd_string },
+                },
+            },
+            label: {
                 kind: "Shacl",
                 path: $rdfs_label,
                 type: {
@@ -1229,7 +1244,7 @@ export var Operation;
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
+            propertySchema: BaseShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         error: $shaclPropertyFromRdf({
@@ -1243,7 +1258,7 @@ export var Operation;
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: BaseShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         name: $shaclPropertyFromRdf({
@@ -1273,9 +1288,9 @@ export var Operation;
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
         $type: Right("Operation"),
         bindings: $convertToScalarSet($identityConversionFunction)(parameters.bindings, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(Operation.schema.properties.bindings.type, value)),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
         error: $convertToScalarSet($identityConversionFunction)(parameters.error, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(Operation.schema.properties.error.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
         name: $convertToMaybe($identityConversionFunction)(parameters.name, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(Operation.schema.properties.name.type, value)),
         parameter: $convertToMaybe($convertToIdentifier)(parameters.parameter, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(Operation.schema.properties.parameter.type, value)),
         result: $convertToMaybe($convertToIdentifier)(parameters.result, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(Operation.schema.properties.result.type, value)),
@@ -1396,77 +1411,77 @@ export var OperationError;
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.classes,
+            propertySchema: BaseShape.schema.properties.classes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         closed: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.closed,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.closed,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         comment: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
+            propertySchema: BaseShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         deactivated: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.deactivated,
+            propertySchema: BaseShape.schema.properties.deactivated,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         extern: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.extern,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.extern,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         fromRdfType: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.fromRdfType,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.fromRdfType,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         ignoredProperties: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.ignoredProperties,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.ignoredProperties,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($iriFromRdfResourceValues))),
         }),
         isDefinedBy: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.isDefinedBy,
+            propertySchema: BaseShape.schema.properties.isDefinedBy,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
         label: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: BaseShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         message: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.message,
+            propertySchema: BaseShape.schema.properties.message,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         nodeKind: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.nodeKind,
+            propertySchema: BaseShape.schema.properties.nodeKind,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         properties: $shaclPropertyFromRdf({
@@ -1480,49 +1495,49 @@ export var OperationError;
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.rdfType,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.rdfType,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         severity: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.severity,
+            propertySchema: BaseShape.schema.properties.severity,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         shaclmateName: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.shaclmateName,
+            propertySchema: BaseShape.schema.properties.shaclmateName,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         subClassOf: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.subClassOf,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.subClassOf,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         toRdfTypes: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.toRdfTypes,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.toRdfTypes,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         tsImports: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.tsImports,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.tsImports,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         types: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.types,
+            propertySchema: NodeShapeSpecificProperties.schema.properties.types,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
     }).chain((properties) => OperationError.create(properties));
@@ -1530,25 +1545,25 @@ export var OperationError;
     OperationError.create = (parameters = {}) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
         $type: Right("OperationError"),
-        classes: $convertToScalarSet($convertToIri)(parameters.classes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.classes.type, value)),
-        closed: $convertToMaybe($identityConversionFunction)(parameters.closed, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.closed.type, value)),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.deactivated.type, value)),
-        extern: $convertToMaybe($identityConversionFunction)(parameters.extern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.extern.type, value)),
-        fromRdfType: $convertToMaybe($convertToIri)(parameters.fromRdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.fromRdfType.type, value)),
-        ignoredProperties: $convertToMaybe($convertToList($convertToIri))(parameters.ignoredProperties, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.ignoredProperties.type, value)),
-        isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.isDefinedBy.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
-        message: $convertToMaybe($identityConversionFunction)(parameters.message, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.message.type, value)),
-        nodeKind: $convertToMaybe(($convertToInIri))(parameters.nodeKind, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.nodeKind.type, value)),
+        classes: $convertToScalarSet($convertToIri)(parameters.classes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(BaseShape.schema.properties.classes.type, value)),
+        closed: $convertToMaybe($identityConversionFunction)(parameters.closed, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.closed.type, value)),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
+        deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.deactivated.type, value)),
+        extern: $convertToMaybe($identityConversionFunction)(parameters.extern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.extern.type, value)),
+        fromRdfType: $convertToMaybe($convertToIri)(parameters.fromRdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.fromRdfType.type, value)),
+        ignoredProperties: $convertToMaybe($convertToList($convertToIri))(parameters.ignoredProperties, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShapeSpecificProperties.schema.properties.ignoredProperties.type, value)),
+        isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.isDefinedBy.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
+        message: $convertToMaybe($identityConversionFunction)(parameters.message, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.message.type, value)),
+        nodeKind: $convertToMaybe(($convertToInIri))(parameters.nodeKind, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.nodeKind.type, value)),
         properties: $convertToScalarSet($convertToIdentifier)(parameters.properties, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(OperationError.schema.properties.properties.type, value)),
-        rdfType: $convertToMaybe($convertToIri)(parameters.rdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.rdfType.type, value)),
-        severity: $convertToMaybe(($convertToInIri))(parameters.severity, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.severity.type, value)),
-        shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.shaclmateName.type, value)),
-        subClassOf: $convertToScalarSet($convertToIri)(parameters.subClassOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.subClassOf.type, value)),
-        toRdfTypes: $convertToScalarSet($convertToIri)(parameters.toRdfTypes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.toRdfTypes.type, value)),
-        tsImports: $convertToScalarSet($identityConversionFunction)(parameters.tsImports, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.tsImports.type, value)),
-        types: $convertToScalarSet($convertToIri)(parameters.types, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.types.type, value)),
+        rdfType: $convertToMaybe($convertToIri)(parameters.rdfType, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.rdfType.type, value)),
+        severity: $convertToMaybe(($convertToInIri))(parameters.severity, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.severity.type, value)),
+        shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.shaclmateName.type, value)),
+        subClassOf: $convertToScalarSet($convertToIri)(parameters.subClassOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.subClassOf.type, value)),
+        toRdfTypes: $convertToScalarSet($convertToIri)(parameters.toRdfTypes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.toRdfTypes.type, value)),
+        tsImports: $convertToScalarSet($identityConversionFunction)(parameters.tsImports, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.tsImports.type, value)),
+        types: $convertToScalarSet($convertToIri)(parameters.types, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShapeSpecificProperties.schema.properties.types.type, value)),
     }).map((object) => $monkeyPatchObject(object, { $toString: OperationError.$toString }));
     OperationError.createUnsafe = (parameters) => OperationError.create(parameters).unsafeCoerce();
     OperationError.fromRdfResource = $wrap_FromRdfResourceFunction(OperationError._fromRdfResource);
@@ -1913,23 +1928,18 @@ export var PropertyGroup;
             propertyPath: $rdf_subject,
             schema: PropertyGroup.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
-        $rdfType: !options.ignoreRdfType
-            ? $ensureRdfResourceType(resource, [PropertyGroup.schema.properties.$rdfType.fromRdfType], {
-                graph: options.graph,
-            })
-            : Right(true),
         comment: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
+            propertySchema: BaseShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         label: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: BaseShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
     }).chain((properties) => PropertyGroup.create(properties));
@@ -1937,8 +1947,8 @@ export var PropertyGroup;
     PropertyGroup.create = (parameters = {}) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
         $type: Right("PropertyGroup"),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
     }).map((object) => $monkeyPatchObject(object, { $toString: PropertyGroup.$toString }));
     PropertyGroup.createUnsafe = (parameters) => PropertyGroup.create(parameters).unsafeCoerce();
     PropertyGroup.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyGroup._fromRdfResource);
@@ -1956,13 +1966,6 @@ export var PropertyGroup;
                 kind: "Identifier",
                 type: { kind: "Identifier" },
             },
-            $rdfType: {
-                fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"),
-                kind: "RdfType",
-                toRdfTypes: [
-                    dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"),
-                ],
-            },
             comment: {
                 kind: "Shacl",
                 path: $rdfs_comment,
@@ -1986,494 +1989,197 @@ export var PropertyGroup;
         label: _propertyGroup.label.map((item) => item.toString()).extract(),
     });
 })(PropertyGroup || (PropertyGroup = {}));
-export var PropertyShape;
-(function (PropertyShape) {
-    PropertyShape._fromRdfResource = (resource, options) => $sequenceRecord({
+export var PropertyShapeSpecificProperties;
+(function (PropertyShapeSpecificProperties) {
+    PropertyShapeSpecificProperties._fromRdfResource = (resource, options) => $sequenceRecord({
         $identifier: $identifierFromRdfResourceValues($rdfResourceIdentifierValues(resource), {
             ...options,
             focusResource: resource,
             propertyPath: $rdf_subject,
-            schema: PropertyShape.schema.properties.$identifier.type,
+            schema: PropertyShapeSpecificProperties.schema.properties.$identifier.type,
         }).chain((values) => values.head()),
-        $rdfType: !options.ignoreRdfType
-            ? $ensureRdfResourceType(resource, [PropertyShape.schema.properties.$rdfType.fromRdfType], {
-                graph: options.graph,
-            })
-            : Right(true),
-        and: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.and,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
-        }),
-        classes: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.classes,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        comment: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        datatype: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.datatype,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        deactivated: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.deactivated,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
         defaultValue: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.defaultValue,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.defaultValue,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($termFromRdfResourceValues)),
         }),
         description: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.description,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.description,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         disjoint: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.disjoint,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.disjoint,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         display: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.display,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.display,
             typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
         equals: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.equals,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.equals,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
-        flags: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.flags,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
         groups: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.groups,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.groups,
             typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
-        hasValues: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.hasValues,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
-        }),
-        ignore: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.ignore,
-            typeFromRdfResourceValues: $defaultValueFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
-        in_: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.in_,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($termFromRdfResourceValues))),
-        }),
-        isDefinedBy: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.isDefinedBy,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
-        }),
-        label: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        languageIn: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.languageIn,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues(($stringFromRdfResourceValues))),
-        }),
         lessThan: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.lessThan,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.lessThan,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         lessThanOrEquals: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.lessThanOrEquals,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.lessThanOrEquals,
             typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
         }),
         maxCount: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.maxCount,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.maxCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
-        maxExclusive: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxExclusive,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
-        }),
-        maxInclusive: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxInclusive,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
-        }),
-        maxLength: $shaclPropertyFromRdf({
+        minCount: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.maxLength,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.minCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
-        message: $shaclPropertyFromRdf({
+        name: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.message,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.name,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
-        minCount: $shaclPropertyFromRdf({
+        order: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.minCount,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.order,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($floatFromRdfResourceValues)),
         }),
-        minExclusive: $shaclPropertyFromRdf({
+        path: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minExclusive,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.path,
+            typeFromRdfResourceValues: $PropertyPath.fromRdfResourceValues,
         }),
-        minInclusive: $shaclPropertyFromRdf({
+        qualifiedMaxCount: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minInclusive,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($literalFromRdfResourceValues),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.qualifiedMaxCount,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
-        minLength: $shaclPropertyFromRdf({
+        qualifiedMinCount: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.minLength,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.qualifiedMinCount,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
         }),
-        mutable: $shaclPropertyFromRdf({
+        qualifiedValueShape: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.mutable,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.qualifiedValueShape,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
-        name: $shaclPropertyFromRdf({
+        qualifiedValueShapesDisjoint: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.name,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties
+                .qualifiedValueShapesDisjoint,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
-        node: $shaclPropertyFromRdf({
+        resolve: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.node,
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.resolve,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
         }),
-        nodeKind: $shaclPropertyFromRdf({
+        uniqueLang: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.nodeKind,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
+            propertySchema: PropertyShapeSpecificProperties.schema.properties.uniqueLang,
+            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
         }),
-        not: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.not,
-            typeFromRdfResourceValues: $setFromRdfResourceValues($identifierFromRdfResourceValues),
-        }),
-        or: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.or,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
-        }),
-        order: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.order,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($floatFromRdfResourceValues)),
-        }),
-        path: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.path,
-            typeFromRdfResourceValues: $PropertyPath.fromRdfResourceValues,
-        }),
-        pattern: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.pattern,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        qualifiedMaxCount: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.qualifiedMaxCount,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
-        }),
-        qualifiedMinCount: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.qualifiedMinCount,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($bigIntFromRdfResourceValues)),
-        }),
-        qualifiedValueShape: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.qualifiedValueShape,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
-        }),
-        qualifiedValueShapesDisjoint: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.qualifiedValueShapesDisjoint,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
-        resolve: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.resolve,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($identifierFromRdfResourceValues),
-        }),
-        severity: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.severity,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        shaclmateName: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.shaclmateName,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
-        }),
-        targetClasses: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetClasses,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        targetNodes: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetNodes,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($termFromRdfResourceValues)),
-        }),
-        targetObjectsOf: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetObjectsOf,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        targetSubjectsOf: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.targetSubjectsOf,
-            typeFromRdfResourceValues: $setFromRdfResourceValues(($iriFromRdfResourceValues)),
-        }),
-        uniqueLang: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: PropertyShape.schema.properties.uniqueLang,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues(($booleanFromRdfResourceValues)),
-        }),
-        xone: $shaclPropertyFromRdf({
-            ...options,
-            focusResource: resource,
-            ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.xone,
-            typeFromRdfResourceValues: $maybeFromRdfResourceValues($listFromRdfResourceValues($identifierFromRdfResourceValues)),
-        }),
-    }).chain((properties) => PropertyShape.create(properties));
-    PropertyShape.$toString = (_propertyShape) => `PropertyShape(${JSON.stringify(PropertyShape.toStringRecord(_propertyShape))})`;
-    PropertyShape.create = (parameters) => $sequenceRecord({
+    }).chain((properties) => PropertyShapeSpecificProperties.create(properties));
+    PropertyShapeSpecificProperties.$toString = (_propertyShapeSpecificProperties) => `PropertyShapeSpecificProperties(${JSON.stringify(PropertyShapeSpecificProperties.toStringRecord(_propertyShapeSpecificProperties))})`;
+    PropertyShapeSpecificProperties.create = (parameters) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
-        $type: Right("PropertyShape"),
-        and: $convertToMaybe($convertToList($convertToIdentifier))(parameters.and, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.and.type, value)),
-        classes: $convertToScalarSet($convertToIri)(parameters.classes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.classes.type, value)),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        datatype: $convertToMaybe($convertToIri)(parameters.datatype, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.datatype.type, value)),
-        deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.deactivated.type, value)),
-        defaultValue: $convertToMaybe($identityConversionFunction)(parameters.defaultValue, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.defaultValue.type, value)),
-        description: $convertToMaybe($identityConversionFunction)(parameters.description, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.description.type, value)),
-        disjoint: $convertToScalarSet($convertToIri)(parameters.disjoint, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShape.schema.properties.disjoint.type, value)),
+        $type: Right("PropertyShapeSpecificProperties"),
+        defaultValue: $convertToMaybe($identityConversionFunction)(parameters.defaultValue, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.defaultValue.type, value)),
+        description: $convertToMaybe($identityConversionFunction)(parameters.description, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.description.type, value)),
+        disjoint: $convertToScalarSet($convertToIri)(parameters.disjoint, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.disjoint.type, value)),
         display: $convertWithDefaultValue($identityConversionFunction, false)(parameters.display, parameters.$defaultNamespace),
-        equals: $convertToScalarSet($convertToIri)(parameters.equals, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShape.schema.properties.equals.type, value)),
-        flags: $convertToMaybe($identityConversionFunction)(parameters.flags, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.flags.type, value)),
-        groups: $convertToScalarSet($convertToIdentifier)(parameters.groups, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShape.schema.properties.groups.type, value)),
-        hasValues: $convertToScalarSet($identityConversionFunction)(parameters.hasValues, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.hasValues.type, value)),
-        ignore: $convertWithDefaultValue($identityConversionFunction, false)(parameters.ignore, parameters.$defaultNamespace),
-        in_: $convertToMaybe($convertToList($identityConversionFunction))(parameters.in_, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.in_.type, value)),
-        isDefinedBy: $convertToMaybe($convertToIdentifier)(parameters.isDefinedBy, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.isDefinedBy.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
-        languageIn: $convertToMaybe($convertToList($identityConversionFunction))(parameters.languageIn, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.languageIn.type, value)),
-        lessThan: $convertToScalarSet($convertToIri)(parameters.lessThan, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShape.schema.properties.lessThan.type, value)),
-        lessThanOrEquals: $convertToScalarSet($convertToIri)(parameters.lessThanOrEquals, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShape.schema.properties.lessThanOrEquals.type, value)),
-        maxCount: $convertToMaybe($convertToBigInt)(parameters.maxCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.maxCount.type, value)),
-        maxExclusive: $convertToMaybe($convertToLiteral)(parameters.maxExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxExclusive.type, value)),
-        maxInclusive: $convertToMaybe($convertToLiteral)(parameters.maxInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxInclusive.type, value)),
-        maxLength: $convertToMaybe($convertToBigInt)(parameters.maxLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.maxLength.type, value)),
-        message: $convertToMaybe($identityConversionFunction)(parameters.message, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.message.type, value)),
-        minCount: $convertToMaybe($convertToBigInt)(parameters.minCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.minCount.type, value)),
-        minExclusive: $convertToMaybe($convertToLiteral)(parameters.minExclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minExclusive.type, value)),
-        minInclusive: $convertToMaybe($convertToLiteral)(parameters.minInclusive, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minInclusive.type, value)),
-        minLength: $convertToMaybe($convertToBigInt)(parameters.minLength, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.minLength.type, value)),
-        mutable: $convertToMaybe($identityConversionFunction)(parameters.mutable, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.mutable.type, value)),
-        name: $convertToMaybe($identityConversionFunction)(parameters.name, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.name.type, value)),
-        node: $convertToMaybe($convertToIdentifier)(parameters.node, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.node.type, value)),
-        nodeKind: $convertToMaybe(($convertToInIri))(parameters.nodeKind, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.nodeKind.type, value)),
-        not: $convertToScalarSet($convertToIdentifier)(parameters.not, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.not.type, value)),
-        or: $convertToMaybe($convertToList($convertToIdentifier))(parameters.or, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.or.type, value)),
-        order: $convertToMaybe($identityConversionFunction)(parameters.order, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.order.type, value)),
+        equals: $convertToScalarSet($convertToIri)(parameters.equals, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.equals.type, value)),
+        groups: $convertToScalarSet($convertToIdentifier)(parameters.groups, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.groups.type, value)),
+        lessThan: $convertToScalarSet($convertToIri)(parameters.lessThan, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.lessThan.type, value)),
+        lessThanOrEquals: $convertToScalarSet($convertToIri)(parameters.lessThanOrEquals, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.lessThanOrEquals
+            .type, value)),
+        maxCount: $convertToMaybe($convertToBigInt)(parameters.maxCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.maxCount.type, value)),
+        minCount: $convertToMaybe($convertToBigInt)(parameters.minCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.minCount.type, value)),
+        name: $convertToMaybe($identityConversionFunction)(parameters.name, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.name.type, value)),
+        order: $convertToMaybe($identityConversionFunction)(parameters.order, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.order.type, value)),
         path: Either.of(parameters.path),
-        pattern: $convertToMaybe($identityConversionFunction)(parameters.pattern, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.pattern.type, value)),
-        qualifiedMaxCount: $convertToMaybe($convertToBigInt)(parameters.qualifiedMaxCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedMaxCount.type, value)),
-        qualifiedMinCount: $convertToMaybe($convertToBigInt)(parameters.qualifiedMinCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedMinCount.type, value)),
-        qualifiedValueShape: $convertToMaybe($convertToIdentifier)(parameters.qualifiedValueShape, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedValueShape.type, value)),
-        qualifiedValueShapesDisjoint: $convertToMaybe($identityConversionFunction)(parameters.qualifiedValueShapesDisjoint, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.qualifiedValueShapesDisjoint.type, value)),
-        resolve: $convertToMaybe($convertToIdentifier)(parameters.resolve, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.resolve.type, value)),
-        severity: $convertToMaybe(($convertToInIri))(parameters.severity, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.severity.type, value)),
-        shaclmateName: $convertToMaybe($identityConversionFunction)(parameters.shaclmateName, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.shaclmateName.type, value)),
-        targetClasses: $convertToScalarSet($convertToIri)(parameters.targetClasses, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetClasses.type, value)),
-        targetNodes: $convertToScalarSet($identityConversionFunction)(parameters.targetNodes, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetNodes.type, value)),
-        targetObjectsOf: $convertToScalarSet($convertToIri)(parameters.targetObjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetObjectsOf.type, value)),
-        targetSubjectsOf: $convertToScalarSet($convertToIri)(parameters.targetSubjectsOf, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(NodeShape.schema.properties.targetSubjectsOf.type, value)),
-        uniqueLang: $convertToMaybe($identityConversionFunction)(parameters.uniqueLang, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShape.schema.properties.uniqueLang.type, value)),
-        xone: $convertToMaybe($convertToList($convertToIdentifier))(parameters.xone, parameters.$defaultNamespace).chain((value) => $validateMaybe($validateArray($identityValidationFunction))(NodeShape.schema.properties.xone.type, value)),
-    }).map((object) => $monkeyPatchObject(object, { $toString: PropertyShape.$toString }));
-    PropertyShape.createUnsafe = (parameters) => PropertyShape.create(parameters).unsafeCoerce();
-    PropertyShape.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyShape._fromRdfResource);
-    PropertyShape.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        qualifiedMaxCount: $convertToMaybe($convertToBigInt)(parameters.qualifiedMaxCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.qualifiedMaxCount
+            .type, value)),
+        qualifiedMinCount: $convertToMaybe($convertToBigInt)(parameters.qualifiedMinCount, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.qualifiedMinCount
+            .type, value)),
+        qualifiedValueShape: $convertToMaybe($convertToIdentifier)(parameters.qualifiedValueShape, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.qualifiedValueShape
+            .type, value)),
+        qualifiedValueShapesDisjoint: $convertToMaybe($identityConversionFunction)(parameters.qualifiedValueShapesDisjoint, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties
+            .qualifiedValueShapesDisjoint.type, value)),
+        resolve: $convertToMaybe($convertToIdentifier)(parameters.resolve, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.resolve.type, value)),
+        uniqueLang: $convertToMaybe($identityConversionFunction)(parameters.uniqueLang, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(PropertyShapeSpecificProperties.schema.properties.uniqueLang.type, value)),
+    }).map((object) => $monkeyPatchObject(object, {
+        $toString: PropertyShapeSpecificProperties.$toString,
+    }));
+    PropertyShapeSpecificProperties.createUnsafe = (parameters) => PropertyShapeSpecificProperties.create(parameters).unsafeCoerce();
+    PropertyShapeSpecificProperties.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyShapeSpecificProperties._fromRdfResource);
+    PropertyShapeSpecificProperties.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
         .toResource()
-        .chain((resource) => PropertyShape.fromRdfResource(resource, options)));
+        .chain((resource) => PropertyShapeSpecificProperties.fromRdfResource(resource, options)));
     let Identifier;
     (function (Identifier) {
         Identifier.parse = $parseIdentifier;
-    })(Identifier = PropertyShape.Identifier || (PropertyShape.Identifier = {}));
-    PropertyShape.isPropertyShape = (object) => object.$type === "PropertyShape";
-    PropertyShape.schema = {
+    })(Identifier = PropertyShapeSpecificProperties.Identifier || (PropertyShapeSpecificProperties.Identifier = {}));
+    PropertyShapeSpecificProperties.isPropertyShapeSpecificProperties = (object) => object.$type === "PropertyShapeSpecificProperties";
+    PropertyShapeSpecificProperties.schema = {
         properties: {
             $identifier: {
                 kind: "Identifier",
                 type: { kind: "Identifier" },
             },
-            $rdfType: {
-                fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"),
-                kind: "RdfType",
-                toRdfTypes: [
-                    dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"),
-                ],
-            },
-            and: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#and"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
-            classes: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            comment: {
-                kind: "Shacl",
-                path: $rdfs_comment,
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            datatype: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"),
-                type: { kind: "Option", itemType: { kind: "Iri" } },
-            },
-            deactivated: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
             defaultValue: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#defaultValue"),
@@ -2509,14 +2215,6 @@ export var PropertyShape;
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#equals"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },
             },
-            flags: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
             groups: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#group"),
@@ -2525,313 +2223,95 @@ export var PropertyShape;
                     itemType: { kind: "Identifier" },
                 },
             },
-            hasValues: {
+            lessThan: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Term", types: ["NamedNode", "Literal"] },
-                },
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThan"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
             },
-            ignore: {
+            lessThanOrEquals: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#ignore"),
-                type: {
-                    kind: "DefaultValue",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                    defaultValue: dataFactory.literal("false", $xsd_boolean),
-                },
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThanOrEquals"),
+                type: { kind: "Set", itemType: { kind: "Iri" } },
             },
-            in_: {
+            maxCount: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#in"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"),
                 type: {
                     kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: {
-                            kind: "Term",
-                            types: ["NamedNode", "Literal"],
-                        },
-                    },
+                    itemType: { kind: "BigInt", datatype: $xsd_integer },
                 },
             },
-            isDefinedBy: {
+            minCount: {
                 kind: "Shacl",
-                path: $rdfs_isDefinedBy,
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "Identifier" },
+                    itemType: { kind: "BigInt", datatype: $xsd_integer },
                 },
             },
-            label: {
+            name: {
                 kind: "Shacl",
-                path: $rdfs_label,
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#name"),
                 type: {
                     kind: "Option",
                     itemType: { kind: "String", datatype: $xsd_string },
                 },
             },
-            languageIn: {
+            order: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#order"),
                 type: {
                     kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "String", datatype: $xsd_string },
-                    },
+                    itemType: { kind: "Float", datatype: $xsd_double },
                 },
             },
-            lessThan: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThan"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            lessThanOrEquals: {
+            path: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#lessThanOrEquals"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#path"),
+                get type() {
+                    return $PropertyPath.schema;
+                },
             },
-            maxCount: {
+            qualifiedMaxCount: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxCount"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMaxCount"),
                 type: {
                     kind: "Option",
                     itemType: { kind: "BigInt", datatype: $xsd_integer },
                 },
             },
-            maxExclusive: {
+            qualifiedMinCount: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMinCount"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "Literal" },
+                    itemType: { kind: "BigInt", datatype: $xsd_integer },
                 },
             },
-            maxInclusive: {
+            qualifiedValueShape: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShape"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "Literal" },
+                    itemType: { kind: "Identifier" },
                 },
             },
-            maxLength: {
+            qualifiedValueShapesDisjoint: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"),
+                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShapesDisjoint"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
+                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
                 },
             },
-            message: {
+            resolve: {
                 kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#message"),
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"),
                 type: {
                     kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
+                    itemType: { kind: "Identifier" },
                 },
             },
-            minCount: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minCount"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            minExclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            minInclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            minLength: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            mutable: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
-            name: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#name"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            node: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#node"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            nodeKind: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
-                        ],
-                    },
-                },
-            },
-            not: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#not"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            or: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#or"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
-            order: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#order"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Float", datatype: $xsd_double },
-                },
-            },
-            path: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#path"),
-                get type() {
-                    return $PropertyPath.schema;
-                },
-            },
-            pattern: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            qualifiedMaxCount: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMaxCount"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            qualifiedMinCount: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedMinCount"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            qualifiedValueShape: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShape"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            qualifiedValueShapesDisjoint: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#qualifiedValueShapesDisjoint"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
-            resolve: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            severity: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
-                get type() {
-                    return {
-                        kind: "Option",
-                        get itemType() {
-                            return Severity.schema;
-                        },
-                    };
-                },
-            },
-            shaclmateName: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            targetClasses: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            targetNodes: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetNode"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Term", types: ["NamedNode", "Literal"] },
-                },
-            },
-            targetObjectsOf: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetObjectsOf"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            targetSubjectsOf: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
             uniqueLang: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"),
@@ -2840,29 +2320,16 @@ export var PropertyShape;
                     itemType: { kind: "Boolean", datatype: $xsd_boolean },
                 },
             },
-            xone: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
         },
     };
-    PropertyShape.toStringRecord = (_propertyShape) => $compactRecord({
-        $identifier: _propertyShape.$identifier().toString(),
-        label: _propertyShape.label.map((item) => item.toString()).extract(),
-        name: _propertyShape.name.map((item) => item.toString()).extract(),
-        path: $PropertyPath.$toString(_propertyShape.path),
-        shaclmateName: _propertyShape.shaclmateName
+    PropertyShapeSpecificProperties.toStringRecord = (_propertyShapeSpecificProperties) => $compactRecord({
+        $identifier: _propertyShapeSpecificProperties.$identifier().toString(),
+        name: _propertyShapeSpecificProperties.name
             .map((item) => item.toString())
             .extract(),
+        path: $PropertyPath.$toString(_propertyShapeSpecificProperties.path),
     });
-})(PropertyShape || (PropertyShape = {}));
+})(PropertyShapeSpecificProperties || (PropertyShapeSpecificProperties = {}));
 export var Service;
 (function (Service) {
     Service._fromRdfResource = (resource, options) => $sequenceRecord({
@@ -2879,14 +2346,14 @@ export var Service;
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.comment,
+            propertySchema: BaseShape.schema.properties.comment,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         label: $shaclPropertyFromRdf({
             ...options,
             focusResource: resource,
             ignoreRdfType: true,
-            propertySchema: NodeShape.schema.properties.label,
+            propertySchema: BaseShape.schema.properties.label,
             typeFromRdfResourceValues: $maybeFromRdfResourceValues(($stringFromRdfResourceValues)),
         }),
         name: $shaclPropertyFromRdf({
@@ -2908,8 +2375,8 @@ export var Service;
     Service.create = (parameters = {}) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier, parameters.$defaultNamespace),
         $type: Right("Service"),
-        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.comment.type, value)),
-        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(NodeShape.schema.properties.label.type, value)),
+        comment: $convertToMaybe($identityConversionFunction)(parameters.comment, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.comment.type, value)),
+        label: $convertToMaybe($identityConversionFunction)(parameters.label, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(BaseShape.schema.properties.label.type, value)),
         name: $convertToMaybe($identityConversionFunction)(parameters.name, parameters.$defaultNamespace).chain((value) => $validateMaybe($identityValidationFunction)(Service.schema.properties.name.type, value)),
         operations: $convertToScalarSet($identityConversionFunction)(parameters.operations, parameters.$defaultNamespace).chain((value) => $validateArray($identityValidationFunction)(Service.schema.properties.operations.type, value)),
     }).map((object) => $monkeyPatchObject(object, { $toString: Service.$toString }));
@@ -3270,6 +2737,75 @@ export var ValidationResult;
     };
     ValidationResult.toStringRecord = (_validationResult) => $compactRecord({ $identifier: _validationResult.$identifier().toString() });
 })(ValidationResult || (ValidationResult = {}));
+export var NodeShape;
+(function (NodeShape) {
+    NodeShape._fromRdfResource = (resource, options) => BaseShape.fromRdfResource(resource, options).chain((member0) => NodeShapeSpecificProperties.fromRdfResource(resource, options).map((member1) => ({
+        ...member0,
+        ...member1,
+        $type: "NodeShape",
+    })));
+    NodeShape.$toString = (value) => JSON.stringify([
+        BaseShape.$toString(value),
+        NodeShapeSpecificProperties.$toString(value),
+    ]);
+    NodeShape.create = (parameters) => BaseShape.create(parameters)
+        .chain((member0) => NodeShapeSpecificProperties.create(parameters).map((member1) => ({
+        ...member0,
+        ...member1,
+        $type: "NodeShape",
+    })))
+        .map((object) => $monkeyPatchObject(object, { $toString: NodeShape.$toString }));
+    NodeShape.createUnsafe = (parameters) => NodeShape.create(parameters).unsafeCoerce();
+    NodeShape.fromRdfResource = $wrap_FromRdfResourceFunction(NodeShape._fromRdfResource);
+    NodeShape.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => NodeShape.fromRdfResource(resource, options)));
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+    })(Identifier = NodeShape.Identifier || (NodeShape.Identifier = {}));
+    NodeShape.isNodeShape = (object) => object.$type === "NodeShape";
+    NodeShape.schema = {
+        kind: "ObjectIntersection",
+        members: [BaseShape.schema, NodeShapeSpecificProperties.schema],
+    };
+})(NodeShape || (NodeShape = {}));
+export var PropertyShape;
+(function (PropertyShape) {
+    PropertyShape._fromRdfResource = (resource, options) => BaseShape.fromRdfResource(resource, options).chain((member0) => PropertyShapeSpecificProperties.fromRdfResource(resource, options).map((member1) => ({
+        ...member0,
+        ...member1,
+        $type: "PropertyShape",
+    })));
+    PropertyShape.$toString = (value) => JSON.stringify([
+        BaseShape.$toString(value),
+        PropertyShapeSpecificProperties.$toString(value),
+    ]);
+    PropertyShape.create = (parameters) => BaseShape.create(parameters)
+        .chain((member0) => PropertyShapeSpecificProperties.create(parameters).map((member1) => ({
+        ...member0,
+        ...member1,
+        $type: "PropertyShape",
+    })))
+        .map((object) => $monkeyPatchObject(object, { $toString: PropertyShape.$toString }));
+    PropertyShape.createUnsafe = (parameters) => PropertyShape.create(parameters).unsafeCoerce();
+    PropertyShape.fromRdfResource = $wrap_FromRdfResourceFunction(PropertyShape._fromRdfResource);
+    PropertyShape.fromRdfResourceValues = (values, options) => values.chainMap((value) => value
+        .toResource()
+        .chain((resource) => PropertyShape.fromRdfResource(resource, options)));
+    let Identifier;
+    (function (Identifier) {
+        Identifier.parse = $parseIdentifier;
+    })(Identifier = PropertyShape.Identifier || (PropertyShape.Identifier = {}));
+    PropertyShape.isPropertyShape = (object) => object.$type === "PropertyShape";
+    PropertyShape.schema = {
+        kind: "ObjectIntersection",
+        members: [
+            BaseShape.schema,
+            PropertyShapeSpecificProperties.schema,
+        ],
+    };
+})(PropertyShape || (PropertyShape = {}));
 export var Shape;
 (function (Shape) {
     Shape.$toString = (value) => {
@@ -3367,290 +2903,16 @@ export var Shape;
                 type: PropertyShape.schema,
             },
         },
-        properties: {
-            and: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#and"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
-            classes: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            comment: {
-                kind: "Shacl",
-                path: $rdfs_comment,
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            datatype: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"),
-                type: { kind: "Option", itemType: { kind: "Iri" } },
-            },
-            deactivated: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
-            flags: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            hasValues: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Term", types: ["NamedNode", "Literal"] },
-                },
-            },
-            ignore: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#ignore"),
-                type: {
-                    kind: "DefaultValue",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                    defaultValue: dataFactory.literal("false", $xsd_boolean),
-                },
-            },
-            in_: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#in"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: {
-                            kind: "Term",
-                            types: ["NamedNode", "Literal"],
-                        },
-                    },
-                },
-            },
-            isDefinedBy: {
-                kind: "Shacl",
-                path: $rdfs_isDefinedBy,
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            label: {
-                kind: "Shacl",
-                path: $rdfs_label,
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            languageIn: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "String", datatype: $xsd_string },
-                    },
-                },
-            },
-            maxExclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxExclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            maxInclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxInclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            maxLength: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#maxLength"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            message: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#message"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            minExclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minExclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            minInclusive: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minInclusive"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Literal" },
-                },
-            },
-            minLength: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#minLength"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "BigInt", datatype: $xsd_integer },
-                },
-            },
-            mutable: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Boolean", datatype: $xsd_boolean },
-                },
-            },
-            node: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#node"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            nodeKind: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNode"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrIRI"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#BlankNodeOrLiteral"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#IRI"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#IRIOrLiteral"),
-                            dataFactory.namedNode("http://www.w3.org/ns/shacl#Literal"),
-                        ],
-                    },
-                },
-            },
-            not: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#not"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Identifier" },
-                },
-            },
-            or: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#or"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
-            pattern: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            severity: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#severity"),
-                get type() {
-                    return {
-                        kind: "Option",
-                        get itemType() {
-                            return Severity.schema;
-                        },
-                    };
-                },
-            },
-            shaclmateName: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
-                type: {
-                    kind: "Option",
-                    itemType: { kind: "String", datatype: $xsd_string },
-                },
-            },
-            targetClasses: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetClass"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            targetNodes: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetNode"),
-                type: {
-                    kind: "Set",
-                    itemType: { kind: "Term", types: ["NamedNode", "Literal"] },
-                },
-            },
-            targetObjectsOf: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetObjectsOf"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            targetSubjectsOf: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#targetSubjectsOf"),
-                type: { kind: "Set", itemType: { kind: "Iri" } },
-            },
-            xone: {
-                kind: "Shacl",
-                path: dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"),
-                type: {
-                    kind: "Option",
-                    itemType: {
-                        kind: "List",
-                        itemType: { kind: "Identifier" },
-                    },
-                },
-            },
-        },
     };
 })(Shape || (Shape = {}));
 export var $Object;
 (function ($Object) {
     function $toString(object) {
         switch (object.$type) {
-            case "NodeShape":
-                return NodeShape.$toString(object);
+            case "BaseShape":
+                return BaseShape.$toString(object);
+            case "NodeShapeSpecificProperties":
+                return NodeShapeSpecificProperties.$toString(object);
             case "Ontology":
                 return Ontology.$toString(object);
             case "Operation":
@@ -3663,14 +2925,18 @@ export var $Object;
                 return OperationHttpBinding.$toString(object);
             case "PropertyGroup":
                 return PropertyGroup.$toString(object);
-            case "PropertyShape":
-                return PropertyShape.$toString(object);
+            case "PropertyShapeSpecificProperties":
+                return PropertyShapeSpecificProperties.$toString(object);
             case "Service":
                 return Service.$toString(object);
             case "ValidationReport":
                 return ValidationReport.$toString(object);
             case "ValidationResult":
                 return ValidationResult.$toString(object);
+            case "NodeShape":
+                return NodeShape.$toString(object);
+            case "PropertyShape":
+                return PropertyShape.$toString(object);
             default:
                 object;
                 throw new Error("should never reach this point");