npm - @shaclmate/compiler - Versions diffs - 4.0.37 → 4.0.39 - Mend

@shaclmate/compiler 4.0.37 → 4.0.39

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

Files changed (162) hide show

package/dist/input/generated.d.ts CHANGED Viewed

@@ -79,7 +79,7 @@ export declare namespace $PropertyPath {
 export interface $ShaclPropertySchema<TypeSchemaT = object> {
     readonly kind: "Shacl";
     readonly path: $PropertyPath;
-    readonly type: () => TypeSchemaT;
+    readonly type: TypeSchemaT;
 }
 export type $ToRdfResourceFunction<ObjectT, IdentifierT extends Resource.Identifier = Resource.Identifier> = (object: ObjectT, options?: {
     graph?: Exclude<Quad_Graph, Variable>;
@@ -102,9 +102,10 @@ export interface PropertyShape {
     readonly datatype: Maybe<NamedNode>;
     readonly deactivated: Maybe<boolean>;
     readonly defaultValue: Maybe<NamedNode | Literal>;
-    readonly description: Maybe<string> /**
+    readonly description: Maybe<string>;
+    /**
      * Whether to include this property in a toString()-type display, defaults to false
-     */;
+     */
     readonly display: boolean;
     readonly flags: readonly string[];
     readonly groups: readonly (BlankNode | NamedNode)[];
@@ -164,7 +165,7 @@ export declare namespace PropertyShape {
         readonly mutable?: boolean | Maybe<boolean>;
         readonly name?: string | Maybe<string>;
         readonly node?: BlankNode | NamedNode | string | Maybe<BlankNode | NamedNode>;
-        readonly nodeKind?: "http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal" | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
+        readonly nodeKind?: ("http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal") | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
         readonly not?: readonly (BlankNode | NamedNode | string | undefined)[];
         readonly or?: readonly (BlankNode | NamedNode | string | undefined)[] | Maybe<readonly (BlankNode | NamedNode)[]>;
         readonly order?: number | Maybe<number>;
@@ -203,7 +204,7 @@ export declare namespace PropertyShape {
         readonly mutable?: boolean | Maybe<boolean>;
         readonly name?: string | Maybe<string>;
         readonly node?: BlankNode | NamedNode | string | Maybe<BlankNode | NamedNode>;
-        readonly nodeKind?: "http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal" | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
+        readonly nodeKind?: ("http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal") | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
         readonly not?: readonly (BlankNode | NamedNode | string | undefined)[];
         readonly or?: readonly (BlankNode | NamedNode | string | undefined)[] | Maybe<readonly (BlankNode | NamedNode)[]>;
         readonly order?: number | Maybe<number>;
@@ -228,388 +229,381 @@ export declare namespace PropertyShape {
         readonly properties: {
             readonly $identifier: {
                 readonly kind: "Identifier";
-                readonly type: () => {
-                    kind: "Identifier";
-                };
-            };
-            readonly $type: {
-                readonly kind: "Discriminant";
-                readonly type: () => {
-                    kind: "TypeDiscriminant";
-                    ownValues: string[];
+                readonly type: {
+                    readonly kind: "Identifier";
                 };
             };
             readonly and: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
             };
             readonly classes: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
             };
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly datatype: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
             };
             readonly deactivated: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
             };
             readonly defaultValue: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Term";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
             };
             readonly description: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
             };
             readonly display: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "DefaultValue";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
+                readonly type: {
+                    readonly kind: "DefaultValue";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
-                    defaultValue: boolean;
+                    readonly defaultValue: false;
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
             };
             readonly flags: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
             };
             readonly groups: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
             };
             readonly hasValues: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Term";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
             };
             readonly in_: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Term";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
             };
             readonly isDefinedBy: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
             readonly languageIn: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "String";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
             };
             readonly maxCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
             };
             readonly maxExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
             };
             readonly maxInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
             };
             readonly maxLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
             };
             readonly minCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
             };
             readonly minExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
             };
             readonly minInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
             };
             readonly minLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
             };
             readonly mutable: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
             };
             readonly name: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
             };
             readonly node: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
             };
             readonly nodeKind: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
+                        readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
             };
             readonly not: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
             };
             readonly or: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
             };
             readonly order: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Float";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Float";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
             };
             readonly path: {
                 readonly kind: "Shacl";
-                readonly type: () => object;
                 readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#path">;
+                readonly type: object;
             };
             readonly patterns: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
             };
             readonly resolve: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
             };
             readonly shaclmateName: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
             };
             readonly uniqueLang: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
             };
             readonly xone: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
             };
         };
     };
@@ -649,36 +643,29 @@ export declare namespace PropertyGroup {
         readonly properties: {
             readonly $identifier: {
                 readonly kind: "Identifier";
-                readonly type: () => {
-                    kind: "Identifier";
-                };
-            };
-            readonly $type: {
-                readonly kind: "Discriminant";
-                readonly type: () => {
-                    kind: "TypeDiscriminant";
-                    ownValues: string[];
+                readonly type: {
+                    readonly kind: "Identifier";
                 };
             };
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
         };
     };
@@ -718,36 +705,29 @@ export declare namespace Ontology {
         readonly properties: {
             readonly $identifier: {
                 readonly kind: "Identifier";
-                readonly type: () => {
-                    kind: "Identifier";
-                };
-            };
-            readonly $type: {
-                readonly kind: "Discriminant";
-                readonly type: () => {
-                    kind: "TypeDiscriminant";
-                    ownValues: string[];
+                readonly type: {
+                    readonly kind: "Identifier";
                 };
             };
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
         };
     };
@@ -827,7 +807,7 @@ export declare namespace NodeShape {
         readonly minLength?: bigint | Maybe<bigint>;
         readonly mutable?: boolean | Maybe<boolean>;
         readonly node?: BlankNode | NamedNode | string | Maybe<BlankNode | NamedNode>;
-        readonly nodeKind?: "http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal" | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
+        readonly nodeKind?: ("http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal") | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
         readonly not?: readonly (BlankNode | NamedNode | string | undefined)[];
         readonly or?: readonly (BlankNode | NamedNode | string | undefined)[] | Maybe<readonly (BlankNode | NamedNode)[]>;
         readonly patterns?: readonly string[];
@@ -868,7 +848,7 @@ export declare namespace NodeShape {
         readonly minLength?: bigint | Maybe<bigint>;
         readonly mutable?: boolean | Maybe<boolean>;
         readonly node?: BlankNode | NamedNode | string | Maybe<BlankNode | NamedNode>;
-        readonly nodeKind?: "http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal" | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
+        readonly nodeKind?: ("http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal") | NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal"> | Maybe<NamedNode<"http://www.w3.org/ns/shacl#BlankNode" | "http://www.w3.org/ns/shacl#BlankNodeOrIRI" | "http://www.w3.org/ns/shacl#BlankNodeOrLiteral" | "http://www.w3.org/ns/shacl#IRI" | "http://www.w3.org/ns/shacl#IRIOrLiteral" | "http://www.w3.org/ns/shacl#Literal">>;
         readonly not?: readonly (BlankNode | NamedNode | string | undefined)[];
         readonly or?: readonly (BlankNode | NamedNode | string | undefined)[] | Maybe<readonly (BlankNode | NamedNode)[]>;
         readonly patterns?: readonly string[];
@@ -895,415 +875,408 @@ export declare namespace NodeShape {
         readonly properties: {
             readonly $identifier: {
                 readonly kind: "Identifier";
-                readonly type: () => {
-                    kind: "Identifier";
-                };
-            };
-            readonly $type: {
-                readonly kind: "Discriminant";
-                readonly type: () => {
-                    kind: "TypeDiscriminant";
-                    ownValues: string[];
+                readonly type: {
+                    readonly kind: "Identifier";
                 };
             };
             readonly and: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
             };
             readonly classes: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
             };
             readonly closed: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
             };
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly datatype: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
             };
             readonly deactivated: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
             };
             readonly discriminantValue: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
             };
             readonly extern: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
             };
             readonly flags: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
             };
             readonly fromRdfType: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
             };
             readonly hasValues: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Term";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
             };
             readonly ignoredProperties: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Iri";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
             };
             readonly in_: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Term";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
             };
             readonly isDefinedBy: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
             readonly languageIn: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "String";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
             };
             readonly maxCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
             };
             readonly maxExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
             };
             readonly maxInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
             };
             readonly maxLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
             };
             readonly minCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
             };
             readonly minExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
             };
             readonly minInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
             };
             readonly minLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
             };
             readonly mutable: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
             };
             readonly node: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
             };
             readonly nodeKind: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
+                        readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
             };
             readonly not: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
             };
             readonly or: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
             };
             readonly patterns: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
             };
             readonly properties: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
             };
             readonly rdfType: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
             };
             readonly shaclmateName: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
             };
             readonly subClassOf: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
             };
             readonly toRdfTypes: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
             };
             readonly tsImports: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
             };
             readonly types: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
             };
             readonly xone: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
             };
         };
     };
@@ -1332,415 +1305,408 @@ export declare namespace Shape {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly and: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
                         };
                         readonly classes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
                         };
                         readonly closed: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly datatype: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
                         };
                         readonly deactivated: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
                         };
                         readonly discriminantValue: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
                         };
                         readonly extern: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
                         };
                         readonly flags: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
                         };
                         readonly fromRdfType: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
                         };
                         readonly hasValues: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
                         };
                         readonly ignoredProperties: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Iri";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
                         };
                         readonly in_: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Term";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
                         };
                         readonly isDefinedBy: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                         readonly languageIn: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "String";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
                         };
                         readonly maxCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
                         };
                         readonly maxExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
                         };
                         readonly maxInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
                         };
                         readonly maxLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
                         };
                         readonly minCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
                         };
                         readonly minExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
                         };
                         readonly minInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
                         };
                         readonly minLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
                         };
                         readonly mutable: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
                         };
                         readonly node: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
                         };
                         readonly nodeKind: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
+                                    readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
                         };
                         readonly not: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
                         };
                         readonly or: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
                         };
                         readonly patterns: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
                         };
                         readonly properties: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
                         };
                         readonly rdfType: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
                         };
                         readonly shaclmateName: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
                         };
                         readonly subClassOf: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
                         };
                         readonly toRdfTypes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
                         };
                         readonly tsImports: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
                         };
                         readonly types: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
                         };
                         readonly xone: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
                         };
                     };
                 };
@@ -1751,388 +1717,381 @@ export declare namespace Shape {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly and: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
                         };
                         readonly classes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly datatype: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
                         };
                         readonly deactivated: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
                         };
                         readonly defaultValue: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
                         };
                         readonly description: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
                         };
                         readonly display: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "DefaultValue";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
+                            readonly type: {
+                                readonly kind: "DefaultValue";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
-                                defaultValue: boolean;
+                                readonly defaultValue: false;
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
                         };
                         readonly flags: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
                         };
                         readonly groups: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
                         };
                         readonly hasValues: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
                         };
                         readonly in_: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Term";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
                         };
                         readonly isDefinedBy: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                         readonly languageIn: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "String";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
                         };
                         readonly maxCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
                         };
                         readonly maxExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
                         };
                         readonly maxInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
                         };
                         readonly maxLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
                         };
                         readonly minCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
                         };
                         readonly minExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
                         };
                         readonly minInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
                         };
                         readonly minLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
                         };
                         readonly mutable: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
                         };
                         readonly name: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
                         };
                         readonly node: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
                         };
                         readonly nodeKind: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
+                                    readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
                         };
                         readonly not: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
                         };
                         readonly or: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
                         };
                         readonly order: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Float";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Float";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
                         };
                         readonly path: {
                             readonly kind: "Shacl";
-                            readonly type: () => object;
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#path">;
+                            readonly type: object;
                         };
                         readonly patterns: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
                         };
                         readonly resolve: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
                         };
                         readonly shaclmateName: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
                         };
                         readonly uniqueLang: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
                         };
                         readonly xone: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
                         };
                     };
                 };
@@ -2141,289 +2100,289 @@ export declare namespace Shape {
         readonly properties: {
             readonly and: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
             };
             readonly classes: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
             };
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly datatype: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
             };
             readonly deactivated: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
             };
             readonly flags: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
             };
             readonly hasValues: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Term";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
             };
             readonly in_: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Term";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Term";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
             };
             readonly isDefinedBy: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
             readonly languageIn: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "String";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
             };
             readonly maxCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
             };
             readonly maxExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
             };
             readonly maxInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
             };
             readonly maxLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
             };
             readonly minCount: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
             };
             readonly minExclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
             };
             readonly minInclusive: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Literal";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Literal";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
             };
             readonly minLength: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "BigInt";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "BigInt";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
             };
             readonly mutable: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Boolean";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
             };
             readonly node: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
             };
             readonly nodeKind: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "Iri";
+                        readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
             };
             readonly not: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "Identifier";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
             };
             readonly or: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
             };
             readonly patterns: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Set";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                readonly type: {
+                    readonly kind: "Set";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
             };
             readonly shaclmateName: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
             };
             readonly xone: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "List";
-                        item: () => {
-                            kind: "Identifier";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "List";
+                        readonly itemType: {
+                            readonly kind: "Identifier";
                         };
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
             };
         };
     };
@@ -2455,415 +2414,408 @@ export declare namespace $Object {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly and: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
                         };
                         readonly classes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
                         };
                         readonly closed: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#closed">;
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly datatype: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
                         };
                         readonly deactivated: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
                         };
                         readonly discriminantValue: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#discriminantValue">;
                         };
                         readonly extern: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#extern">;
                         };
                         readonly flags: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
                         };
                         readonly fromRdfType: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#fromRdfType">;
                         };
                         readonly hasValues: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
                         };
                         readonly ignoredProperties: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Iri";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ignoredProperties">;
                         };
                         readonly in_: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Term";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
                         };
                         readonly isDefinedBy: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                         readonly languageIn: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "String";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
                         };
                         readonly maxCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
                         };
                         readonly maxExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
                         };
                         readonly maxInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
                         };
                         readonly maxLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
                         };
                         readonly minCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
                         };
                         readonly minExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
                         };
                         readonly minInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
                         };
                         readonly minLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
                         };
                         readonly mutable: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
                         };
                         readonly node: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
                         };
                         readonly nodeKind: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
+                                    readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
                         };
                         readonly not: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
                         };
                         readonly or: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
                         };
                         readonly patterns: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
                         };
                         readonly properties: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#property">;
                         };
                         readonly rdfType: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#rdfType">;
                         };
                         readonly shaclmateName: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
                         };
                         readonly subClassOf: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#subClassOf">;
                         };
                         readonly toRdfTypes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#toRdfType">;
                         };
                         readonly tsImports: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
                         };
                         readonly types: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/1999/02/22-rdf-syntax-ns#type">;
                         };
                         readonly xone: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
                         };
                     };
                 };
@@ -2874,36 +2826,29 @@ export declare namespace $Object {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                     };
                 };
@@ -2914,36 +2859,29 @@ export declare namespace $Object {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                     };
                 };
@@ -2954,388 +2892,381 @@ export declare namespace $Object {
                     readonly properties: {
                         readonly $identifier: {
                             readonly kind: "Identifier";
-                            readonly type: () => {
-                                kind: "Identifier";
-                            };
-                        };
-                        readonly $type: {
-                            readonly kind: "Discriminant";
-                            readonly type: () => {
-                                kind: "TypeDiscriminant";
-                                ownValues: string[];
+                            readonly type: {
+                                readonly kind: "Identifier";
                             };
                         };
                         readonly and: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#and">;
                         };
                         readonly classes: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#class">;
                         };
                         readonly comment: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
                         };
                         readonly datatype: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#datatype">;
                         };
                         readonly deactivated: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#deactivated">;
                         };
                         readonly defaultValue: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#defaultValue">;
                         };
                         readonly description: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#description">;
                         };
                         readonly display: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "DefaultValue";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
+                            readonly type: {
+                                readonly kind: "DefaultValue";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
-                                defaultValue: boolean;
+                                readonly defaultValue: false;
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#display">;
                         };
                         readonly flags: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#flags">;
                         };
                         readonly groups: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#group">;
                         };
                         readonly hasValues: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Term";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#hasValue">;
                         };
                         readonly in_: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Term";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Term";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#in">;
                         };
                         readonly isDefinedBy: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#isDefinedBy">;
                         };
                         readonly label: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
                         };
                         readonly languageIn: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "String";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#languageIn">;
                         };
                         readonly maxCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxCount">;
                         };
                         readonly maxExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxExclusive">;
                         };
                         readonly maxInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxInclusive">;
                         };
                         readonly maxLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#maxLength">;
                         };
                         readonly minCount: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minCount">;
                         };
                         readonly minExclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minExclusive">;
                         };
                         readonly minInclusive: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Literal";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Literal";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minInclusive">;
                         };
                         readonly minLength: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "BigInt";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "BigInt";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#minLength">;
                         };
                         readonly mutable: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#mutable">;
                         };
                         readonly name: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#name">;
                         };
                         readonly node: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#node">;
                         };
                         readonly nodeKind: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Iri";
+                                    readonly in: readonly [import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNode">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrIRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#BlankNodeOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRI">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#IRIOrLiteral">, import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#Literal">];
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#nodeKind">;
                         };
                         readonly not: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#not">;
                         };
                         readonly or: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#or">;
                         };
                         readonly order: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Float";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Float";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#order">;
                         };
                         readonly path: {
                             readonly kind: "Shacl";
-                            readonly type: () => object;
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#path">;
+                            readonly type: object;
                         };
                         readonly patterns: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Set";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
+                            readonly type: {
+                                readonly kind: "Set";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#pattern">;
                         };
                         readonly resolve: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Identifier";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#resolve">;
                         };
                         readonly shaclmateName: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "String";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "String";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#name">;
                         };
                         readonly uniqueLang: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "Boolean";
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
                         };
                         readonly xone: {
                             readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "List";
-                                    item: () => {
-                                        kind: "Identifier";
+                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
+                            readonly type: {
+                                readonly kind: "Option";
+                                readonly itemType: {
+                                    readonly kind: "List";
+                                    readonly itemType: {
+                                        readonly kind: "Identifier";
                                     };
                                 };
                             };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#xone">;
                         };
                     };
                 };
@@ -3344,23 +3275,23 @@ export declare namespace $Object {
         readonly properties: {
             readonly comment: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#comment">;
             };
             readonly label: {
                 readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "String";
+                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
+                readonly type: {
+                    readonly kind: "Option";
+                    readonly itemType: {
+                        readonly kind: "String";
                     };
                 };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2000/01/rdf-schema#label">;
             };
         };
     };