@shaclmate/compiler 4.0.13 → 4.0.14

package/dist/input/generated.js

@@ -237,8 +237,8 @@ export var PropertyShape;
             !$filterArray($filterIri)(filter.classes, value.classes)) {
             return false;
         }
-        if (filter.comments !== undefined &&
-            !$filterArray($filterString)(filter.comments, value.comments)) {
+        if (filter.comment !== undefined &&
+            !$filterMaybe($filterString)(filter.comment, value.comment)) {
             return false;
         }
         if (filter.datatype !== undefined &&
@@ -253,8 +253,8 @@ export var PropertyShape;
             !$filterMaybe($filterTerm)(filter.defaultValue, value.defaultValue)) {
             return false;
         }
-        if (filter.descriptions !== undefined &&
-            !$filterArray($filterString)(filter.descriptions, value.descriptions)) {
+        if (filter.description !== undefined &&
+            !$filterMaybe($filterString)(filter.description, value.description)) {
             return false;
         }
         if (filter.flags !== undefined &&
@@ -277,8 +277,8 @@ export var PropertyShape;
             !$filterMaybe($filterIdentifier)(filter.isDefinedBy, value.isDefinedBy)) {
             return false;
         }
-        if (filter.labels !== undefined &&
-            !$filterArray($filterString)(filter.labels, value.labels)) {
+        if (filter.label !== undefined &&
+            !$filterMaybe($filterString)(filter.label, value.label)) {
             return false;
         }
         if (filter.languageIn !== undefined &&
@@ -325,10 +325,6 @@ export var PropertyShape;
             !$filterMaybe($filterString)(filter.name, value.name)) {
             return false;
         }
-        if (filter.names !== undefined &&
-            !$filterArray($filterString)(filter.names, value.names)) {
-            return false;
-        }
         if (filter.nodeKind !== undefined &&
             !$filterMaybe($filterIri)(filter.nodeKind, value.nodeKind)) {
             return false;
@@ -361,6 +357,10 @@ export var PropertyShape;
             !$filterMaybe($filterIdentifier)(filter.resolve, value.resolve)) {
             return false;
         }
+        if (filter.shaclmateName !== undefined &&
+            !$filterMaybe($filterString)(filter.shaclmateName, value.shaclmateName)) {
+            return false;
+        }
         if (filter.uniqueLang !== undefined &&
             !$filterMaybe($filterBoolean)(filter.uniqueLang, value.uniqueLang)) {
             return false;
@@ -462,17 +462,18 @@ export var PropertyShape;
         }).chain((classes) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.comments,
+            propertySchema: PropertyShape.$schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties.comments.path,
-                value: valuesArray,
-            })),
-        }).chain((comments) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema.properties.datatype,
@@ -531,18 +532,19 @@ export var PropertyShape;
         }).chain((defaultValue) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.descriptions,
+            propertySchema: PropertyShape.$schema.properties.description,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties
-                    .descriptions.path,
-                value: valuesArray,
-            })),
-        }).chain((descriptions) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties
+                        .description.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((description) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema.properties.flags,
@@ -654,18 +656,19 @@ export var PropertyShape;
         }).chain((isDefinedBy) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyShape.$schema.properties.labels,
+            propertySchema: PropertyShape.$schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties
-                    .labels.path,
-                value: valuesArray,
-            })),
-        }).chain((labels) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema
+                        .properties.label.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((label) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema.properties.languageIn,
@@ -871,25 +874,6 @@ export var PropertyShape;
                     value: Maybe.empty(),
                 })),
         }).chain((name) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.$schema
-                .properties
-                .names,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape
-                    .$schema
-                    .properties
-                    .names
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((names) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema
@@ -1061,6 +1045,27 @@ export var PropertyShape;
                     value: Maybe.empty(),
                 })),
         }).chain((resolve) => $shaclPropertyFromRdf({
+            graph: _$options.graph,
+            resource: $resource,
+            propertySchema: PropertyShape.$schema
+                .properties
+                .shaclmateName,
+            typeFromRdf: (resourceValues) => resourceValues
+                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                .chain((values) => values.chainMap((value) => value.toString()))
+                .map((values) => values.length >
+                0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape
+                        .$schema
+                        .properties
+                        .shaclmateName
+                        .path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((shaclmateName) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema
@@ -1139,17 +1144,17 @@ export var PropertyShape;
             $type,
             and,
             classes,
-            comments,
+            comment,
             datatype,
             deactivated,
             defaultValue,
-            descriptions,
+            description,
             flags,
             groups,
             hasValues,
             in_,
             isDefinedBy,
-            labels,
+            label,
             languageIn,
             maxCount,
             maxExclusive,
@@ -1161,7 +1166,6 @@ export var PropertyShape;
             minLength,
             mutable,
             name,
-            names,
             nodeKind,
             nodes,
             not,
@@ -1170,6 +1174,7 @@ export var PropertyShape;
             path,
             patterns,
             resolve,
+            shaclmateName,
             uniqueLang,
             visibility,
             xone,
@@ -1207,10 +1212,10 @@ export var PropertyShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
             },
-            comments: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
@@ -1239,10 +1244,10 @@ export var PropertyShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#defaultValue"),
             },
-            descriptions: {
+            description: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#description"),
@@ -1290,10 +1295,10 @@ export var PropertyShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"),
             },
-            labels: {
+            label: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
@@ -1387,14 +1392,6 @@ export var PropertyShape;
                     kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
-            },
-            names: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Set",
-                    item: () => ({ kind: "String" }),
-                }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#name"),
             },
             nodeKind: {
@@ -1471,6 +1468,14 @@ export var PropertyShape;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"),
             },
+            shaclmateName: {
+                kind: "Shacl",
+                type: () => ({
+                    kind: "Maybe",
+                    item: () => ({ kind: "String" }),
+                }),
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
+            },
             uniqueLang: {
                 kind: "Shacl",
                 type: () => ({
@@ -1537,7 +1542,9 @@ export var PropertyShape;
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#class"), _propertyShape.classes.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyShape.comments.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyShape.comment
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), _propertyShape.datatype.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), _propertyShape.deactivated
             .toList()
@@ -1545,9 +1552,9 @@ export var PropertyShape;
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#defaultValue"), _propertyShape.defaultValue.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#description"), _propertyShape.descriptions.flatMap((item) => [
-            $literalFactory.string(item),
-        ]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#description"), _propertyShape.description
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), _propertyShape.flags.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#group"), _propertyShape.groups.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), _propertyShape.hasValues.flatMap((item) => [item]), options?.graph);
@@ -1574,7 +1581,9 @@ export var PropertyShape;
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), _propertyShape.isDefinedBy.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyShape.labels.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyShape.label
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), _propertyShape.languageIn.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
@@ -1626,10 +1635,9 @@ export var PropertyShape;
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _propertyShape.name
+        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#name"), _propertyShape.name
             .toList()
             .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#name"), _propertyShape.names.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), _propertyShape.nodeKind.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), _propertyShape.nodes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), _propertyShape.not.flatMap((item) => [item]), options?.graph);
@@ -1668,6 +1676,9 @@ export var PropertyShape;
         ], options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), _propertyShape.patterns.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#resolve"), _propertyShape.resolve.toList(), options?.graph);
+        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _propertyShape.shaclmateName
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"), _propertyShape.uniqueLang
             .toList()
             .flatMap((value) => [
@@ -1712,12 +1723,12 @@ export var PropertyGroup;
             !$filterIdentifier(filter.$identifier, value.$identifier)) {
             return false;
         }
-        if (filter.comments !== undefined &&
-            !$filterArray($filterString)(filter.comments, value.comments)) {
+        if (filter.comment !== undefined &&
+            !$filterMaybe($filterString)(filter.comment, value.comment)) {
             return false;
         }
-        if (filter.labels !== undefined &&
-            !$filterArray($filterString)(filter.labels, value.labels)) {
+        if (filter.label !== undefined &&
+            !$filterMaybe($filterString)(filter.label, value.label)) {
             return false;
         }
         return true;
@@ -1779,30 +1790,32 @@ export var PropertyGroup;
             .chain(($identifier) => Right("PropertyGroup").chain(($type) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyGroup.$schema.properties.comments,
+            propertySchema: PropertyGroup.$schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyGroup.$schema.properties.comments.path,
-                value: valuesArray,
-            })),
-        }).chain((comments) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: PropertyGroup.$schema.properties.labels,
+            propertySchema: PropertyGroup.$schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyGroup.$schema.properties.labels.path,
-                value: valuesArray,
-            })),
-        }).map((labels) => ({ $identifier, $type, comments, labels }))))));
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.label.path,
+                    value: Maybe.empty(),
+                })),
+        }).map((label) => ({ $identifier, $type, comment, label }))))));
     };
     PropertyGroup.$schema = {
         properties: {
@@ -1817,18 +1830,18 @@ export var PropertyGroup;
                     ownValues: ["PropertyGroup"],
                 }),
             },
-            comments: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
             },
-            labels: {
+            label: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
@@ -1842,8 +1855,12 @@ export var PropertyGroup;
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), options?.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyGroup.comments.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyGroup.labels.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _propertyGroup.comment
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _propertyGroup.label
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         return resource;
     }
     PropertyGroup.$toRdfResource = $toRdfResource;
@@ -1860,8 +1877,12 @@ export var Ontology;
             !$filterIdentifier(filter.$identifier, value.$identifier)) {
             return false;
         }
-        if (filter.labels !== undefined &&
-            !$filterArray($filterString)(filter.labels, value.labels)) {
+        if (filter.comment !== undefined &&
+            !$filterMaybe($filterString)(filter.comment, value.comment)) {
+            return false;
+        }
+        if (filter.label !== undefined &&
+            !$filterMaybe($filterString)(filter.label, value.label)) {
             return false;
         }
         if (filter.tsFeatureExcludes !== undefined &&
@@ -1939,17 +1960,32 @@ export var Ontology;
             .chain(($identifier) => Right("Ontology").chain(($type) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: Ontology.$schema.properties.labels,
+            propertySchema: Ontology.$schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: Ontology.$schema.properties.labels.path,
-                value: valuesArray,
-            })),
-        }).chain((labels) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.comment.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((comment) => $shaclPropertyFromRdf({
+            graph: _$options.graph,
+            resource: $resource,
+            propertySchema: Ontology.$schema.properties.label,
+            typeFromRdf: (resourceValues) => resourceValues
+                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                .chain((values) => values.chainMap((value) => value.toString()))
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.label.path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((label) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: Ontology.$schema.properties.tsFeatureExcludes,
@@ -1992,7 +2028,8 @@ export var Ontology;
                 .map((values) => values.toArray())
                 .map((valuesArray) => Resource.Values.fromValue({
                 focusResource: $resource,
-                propertyPath: Ontology.$schema.properties.tsFeatureIncludes.path,
+                propertyPath: Ontology.$schema.properties.tsFeatureIncludes
+                    .path,
                 value: valuesArray,
             })),
         }).chain((tsFeatureIncludes) => $shaclPropertyFromRdf({
@@ -2028,12 +2065,13 @@ export var Ontology;
         }).map((tsObjectDeclarationType) => ({
             $identifier,
             $type,
-            labels,
+            comment,
+            label,
             tsFeatureExcludes,
             tsFeatureIncludes,
             tsImports,
             tsObjectDeclarationType,
-        })))))))));
+        }))))))))));
     };
     Ontology.$schema = {
         properties: {
@@ -2048,10 +2086,18 @@ export var Ontology;
                     ownValues: ["Ontology"],
                 }),
             },
-            labels: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
+                    item: () => ({ kind: "String" }),
+                }),
+                path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
+            },
+            label: {
+                kind: "Shacl",
+                type: () => ({
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
@@ -2131,7 +2177,12 @@ export var Ontology;
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), options?.graph);
         }
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _ontology.labels.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _ontology.comment
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _ontology.label
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), _ontology.tsFeatureExcludes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), _ontology.tsFeatureIncludes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), _ontology.tsImports.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
@@ -2168,8 +2219,8 @@ export var NodeShape;
             !$filterMaybe($filterBoolean)(filter.closed, value.closed)) {
             return false;
         }
-        if (filter.comments !== undefined &&
-            !$filterArray($filterString)(filter.comments, value.comments)) {
+        if (filter.comment !== undefined &&
+            !$filterMaybe($filterString)(filter.comment, value.comment)) {
             return false;
         }
         if (filter.datatype !== undefined &&
@@ -2216,8 +2267,8 @@ export var NodeShape;
             !$filterMaybe($filterIdentifier)(filter.isDefinedBy, value.isDefinedBy)) {
             return false;
         }
-        if (filter.labels !== undefined &&
-            !$filterArray($filterString)(filter.labels, value.labels)) {
+        if (filter.label !== undefined &&
+            !$filterMaybe($filterString)(filter.label, value.label)) {
             return false;
         }
         if (filter.languageIn !== undefined &&
@@ -2260,10 +2311,6 @@ export var NodeShape;
             !$filterMaybe($filterBoolean)(filter.mutable, value.mutable)) {
             return false;
         }
-        if (filter.name !== undefined &&
-            !$filterMaybe($filterString)(filter.name, value.name)) {
-            return false;
-        }
         if (filter.nodeKind !== undefined &&
             !$filterMaybe($filterIri)(filter.nodeKind, value.nodeKind)) {
             return false;
@@ -2292,6 +2339,10 @@ export var NodeShape;
             !$filterMaybe($filterIri)(filter.rdfType, value.rdfType)) {
             return false;
         }
+        if (filter.shaclmateName !== undefined &&
+            !$filterMaybe($filterString)(filter.shaclmateName, value.shaclmateName)) {
+            return false;
+        }
         if (filter.toRdfTypes !== undefined &&
             !$filterArray($filterIri)(filter.toRdfTypes, value.toRdfTypes)) {
             return false;
@@ -2431,17 +2482,19 @@ export var NodeShape;
         }).chain((closed) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.comments,
+            propertySchema: NodeShape.$schema.properties.comment,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.$schema.properties.comments.path,
-                value: valuesArray,
-            })),
-        }).chain((comments) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape.$schema.properties.comment
+                        .path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((comment) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema.properties.datatype,
@@ -2661,19 +2714,21 @@ export var NodeShape;
         }).chain((isDefinedBy) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema.properties.labels,
+            propertySchema: NodeShape.$schema.properties.label,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.toArray())
-                .map((valuesArray) => Resource.Values.fromValue({
-                focusResource: $resource,
-                propertyPath: PropertyShape.$schema
-                    .properties.labels
-                    .path,
-                value: valuesArray,
-            })),
-        }).chain((labels) => $shaclPropertyFromRdf({
+                .map((values) => values.length > 0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape
+                        .$schema
+                        .properties.label
+                        .path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((label) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema.properties.languageIn,
@@ -2879,27 +2934,6 @@ export var NodeShape;
                     value: Maybe.empty(),
                 })),
         }).chain((mutable) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.$schema
-                .properties
-                .name,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
-                .chain((values) => values.chainMap((value) => value.toString()))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .$schema
-                        .properties
-                        .name
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((name) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema
@@ -3050,6 +3084,27 @@ export var NodeShape;
                     value: Maybe.empty(),
                 })),
         }).chain((rdfType) => $shaclPropertyFromRdf({
+            graph: _$options.graph,
+            resource: $resource,
+            propertySchema: NodeShape.$schema
+                .properties
+                .shaclmateName,
+            typeFromRdf: (resourceValues) => resourceValues
+                .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
+                .chain((values) => values.chainMap((value) => value.toString()))
+                .map((values) => values.length >
+                0
+                ? values.map((value) => Maybe.of(value))
+                : Resource.Values.fromValue({
+                    focusResource: $resource,
+                    propertyPath: PropertyShape
+                        .$schema
+                        .properties
+                        .shaclmateName
+                        .path,
+                    value: Maybe.empty(),
+                })),
+        }).chain((shaclmateName) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema
@@ -3204,7 +3259,7 @@ export var NodeShape;
             and,
             classes,
             closed,
-            comments,
+            comment,
             datatype,
             deactivated,
             discriminantValue,
@@ -3216,7 +3271,7 @@ export var NodeShape;
             ignoredProperties,
             in_,
             isDefinedBy,
-            labels,
+            label,
             languageIn,
             maxCount,
             maxExclusive,
@@ -3227,7 +3282,6 @@ export var NodeShape;
             minInclusive,
             minLength,
             mutable,
-            name,
             nodeKind,
             nodes,
             not,
@@ -3235,6 +3289,7 @@ export var NodeShape;
             patterns,
             properties,
             rdfType,
+            shaclmateName,
             toRdfTypes,
             tsFeatureExcludes,
             tsFeatureIncludes,
@@ -3291,10 +3346,10 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#closed"),
             },
-            comments: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
@@ -3400,10 +3455,10 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"),
             },
-            labels: {
+            label: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
@@ -3491,14 +3546,6 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"),
             },
-            name: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({ kind: "String" }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
-            },
             nodeKind: {
                 kind: "Shacl",
                 type: () => ({
@@ -3568,6 +3615,14 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"),
             },
+            shaclmateName: {
+                kind: "Shacl",
+                type: () => ({
+                    kind: "Maybe",
+                    item: () => ({ kind: "String" }),
+                }),
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
+            },
             toRdfTypes: {
                 kind: "Shacl",
                 type: () => ({
@@ -3695,7 +3750,9 @@ export var NodeShape;
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _nodeShape.comments.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"), _nodeShape.comment
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#datatype"), _nodeShape.datatype.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#deactivated"), _nodeShape.deactivated
             .toList()
@@ -3759,7 +3816,9 @@ export var NodeShape;
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"), _nodeShape.isDefinedBy.toList(), options?.graph);
-        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _nodeShape.labels.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
+        resource.add(dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"), _nodeShape.label
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#languageIn"), _nodeShape.languageIn.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
@@ -3811,9 +3870,6 @@ export var NodeShape;
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _nodeShape.name
-            .toList()
-            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#nodeKind"), _nodeShape.nodeKind.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#node"), _nodeShape.nodes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#not"), _nodeShape.not.flatMap((item) => [item]), options?.graph);
@@ -3842,6 +3898,9 @@ export var NodeShape;
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"), _nodeShape.patterns.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#property"), _nodeShape.properties.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#rdfType"), _nodeShape.rdfType.toList(), options?.graph);
+        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"), _nodeShape.shaclmateName
+            .toList()
+            .flatMap((value) => [$literalFactory.string(value)]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#toRdfType"), _nodeShape.toRdfTypes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), _nodeShape.tsFeatureExcludes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), _nodeShape.tsFeatureIncludes.flatMap((item) => [item]), options?.graph);
@@ -3875,15 +3934,6 @@ export var NodeShape;
 })(NodeShape || (NodeShape = {}));
 export var Shape;
 (function (Shape) {
-    Shape.$toRdfResource = (value, options) => {
-        if (NodeShape.isNodeShape(value)) {
-            return NodeShape.$toRdfResource(value, options);
-        }
-        if (PropertyShape.isPropertyShape(value)) {
-            return PropertyShape.$toRdfResource(value, options);
-        }
-        throw new Error("unrecognized type");
-    };
     Shape.$filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier)) {
@@ -3966,10 +4016,10 @@ export var Shape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
             },
-            comments: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
@@ -4025,10 +4075,10 @@ export var Shape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#isDefinedBy"),
             },
-            labels: {
+            label: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
@@ -4116,14 +4166,6 @@ export var Shape;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#mutable"),
             },
-            name: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({ kind: "String" }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
-            },
             nodeKind: {
                 kind: "Shacl",
                 type: () => ({
@@ -4177,6 +4219,14 @@ export var Shape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#pattern"),
             },
+            shaclmateName: {
+                kind: "Shacl",
+                type: () => ({
+                    kind: "Maybe",
+                    item: () => ({ kind: "String" }),
+                }),
+                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#name"),
+            },
             xone: {
                 kind: "Shacl",
                 type: () => ({
@@ -4190,6 +4240,15 @@ export var Shape;
             },
         },
     };
+    Shape.$toRdfResource = (value, options) => {
+        if (NodeShape.isNodeShape(value)) {
+            return NodeShape.$toRdfResource(value, options);
+        }
+        if (PropertyShape.isPropertyShape(value)) {
+            return PropertyShape.$toRdfResource(value, options);
+        }
+        throw new Error("unrecognized type");
+    };
     Shape.$toRdfResourceValues = ((value, _options) => {
         if (NodeShape.isNodeShape(value)) {
             return [
@@ -4216,21 +4275,6 @@ export var Shape;
 })(Shape || (Shape = {}));
 export var $Object;
 (function ($Object) {
-    $Object.$toRdfResource = (value, options) => {
-        if (NodeShape.isNodeShape(value)) {
-            return NodeShape.$toRdfResource(value, options);
-        }
-        if (Ontology.isOntology(value)) {
-            return Ontology.$toRdfResource(value, options);
-        }
-        if (PropertyGroup.isPropertyGroup(value)) {
-            return PropertyGroup.$toRdfResource(value, options);
-        }
-        if (PropertyShape.isPropertyShape(value)) {
-            return PropertyShape.$toRdfResource(value, options);
-        }
-        throw new Error("unrecognized type");
-    };
     $Object.$filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
             !$filterIdentifier(filter.$identifier, value.$identifier)) {
@@ -4337,16 +4381,39 @@ export var $Object;
             },
         },
         properties: {
-            labels: {
+            comment: {
                 kind: "Shacl",
                 type: () => ({
-                    kind: "Set",
+                    kind: "Maybe",
+                    item: () => ({ kind: "String" }),
+                }),
+                path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#comment"),
+            },
+            label: {
+                kind: "Shacl",
+                type: () => ({
+                    kind: "Maybe",
                     item: () => ({ kind: "String" }),
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/2000/01/rdf-schema#label"),
             },
         },
     };
+    $Object.$toRdfResource = (value, options) => {
+        if (NodeShape.isNodeShape(value)) {
+            return NodeShape.$toRdfResource(value, options);
+        }
+        if (Ontology.isOntology(value)) {
+            return Ontology.$toRdfResource(value, options);
+        }
+        if (PropertyGroup.isPropertyGroup(value)) {
+            return PropertyGroup.$toRdfResource(value, options);
+        }
+        if (PropertyShape.isPropertyShape(value)) {
+            return PropertyShape.$toRdfResource(value, options);
+        }
+        throw new Error("unrecognized type");
+    };
     $Object.$toRdfResourceValues = ((value, _options) => {
         if (NodeShape.isNodeShape(value)) {
             return [
@@ -4609,7 +4676,7 @@ export class $RdfjsDatasetObjectSet {
             },
         ], query);
     }
-    $objectsSync(objectType, query) {
+    $objectsSync(namedObjectType, query) {
         const graph = query?.graph ?? this.$graph;
         const limit = query?.limit ?? Number.MAX_SAFE_INTEGER;
         if (limit <= 0) {
@@ -4633,11 +4700,11 @@ export class $RdfjsDatasetObjectSet {
             }));
             sortResources = false;
         }
-        else if (objectType.$fromRdfTypes.length > 0) {
+        else if (namedObjectType.$fromRdfTypes.length > 0) {
             const identifierSet = new $IdentifierSet();
             resources = [];
             sortResources = true;
-            for (const fromRdfType of objectType.$fromRdfTypes) {
+            for (const fromRdfType of namedObjectType.$fromRdfTypes) {
                 for (const resource of resourceSet.instancesOf(fromRdfType, {
                     graph,
                 })) {
@@ -4669,7 +4736,7 @@ export class $RdfjsDatasetObjectSet {
                 identifierSet.add(quad.subject);
                 const resource = resourceSet.resource(quad.subject);
                 // Eagerly eliminate the majority of resources that won't match the object type
-                objectType
+                namedObjectType
                     .$fromRdfResource(resource, fromRdfResourceOptions)
                     .ifRight((object) => {
                     resources.push({ object, resource });
@@ -4684,13 +4751,13 @@ export class $RdfjsDatasetObjectSet {
         const objects = [];
         for (let { object, resource } of resources) {
             if (!object) {
-                const objectEither = objectType.$fromRdfResource(resource, fromRdfResourceOptions);
+                const objectEither = namedObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
                 if (objectEither.isLeft()) {
                     return objectEither;
                 }
                 object = objectEither.unsafeCoerce();
             }
-            if (query?.filter && !objectType.$filter(query.filter, object)) {
+            if (query?.filter && !namedObjectType.$filter(query.filter, object)) {
                 continue;
             }
             if (objectI++ >= offset) {
@@ -4702,7 +4769,7 @@ export class $RdfjsDatasetObjectSet {
         }
         return Right(objects);
     }
-    $objectUnionsSync(objectTypes, query) {
+    $objectUnionsSync(namedObjectTypes, query) {
         const graph = query?.graph ?? this.$graph;
         const limit = query?.limit ?? Number.MAX_SAFE_INTEGER;
         if (limit <= 0) {
@@ -4726,18 +4793,18 @@ export class $RdfjsDatasetObjectSet {
             }));
             sortResources = false;
         }
-        else if (objectTypes.every((objectType) => objectType.$fromRdfTypes.length > 0)) {
+        else if (namedObjectTypes.every((namedObjectType) => namedObjectType.$fromRdfTypes.length > 0)) {
             const identifierSet = new $IdentifierSet();
             resources = [];
             sortResources = true;
-            for (const objectType of objectTypes) {
-                for (const fromRdfType of objectType.$fromRdfTypes) {
+            for (const namedObjectType of namedObjectTypes) {
+                for (const fromRdfType of namedObjectType.$fromRdfTypes) {
                     for (const resource of resourceSet.instancesOf(fromRdfType, {
                         graph,
                     })) {
                         if (!identifierSet.has(resource.identifier)) {
                             identifierSet.add(resource.identifier);
-                            resources.push({ objectType, resource });
+                            resources.push({ namedObjectType, resource });
                         }
                     }
                 }
@@ -4764,11 +4831,11 @@ export class $RdfjsDatasetObjectSet {
                 identifierSet.add(quad.subject);
                 // Eagerly eliminate the majority of resources that won't match the object types
                 const resource = resourceSet.resource(quad.subject);
-                for (const objectType of objectTypes) {
-                    if (objectType
+                for (const namedObjectType of namedObjectTypes) {
+                    if (namedObjectType
                         .$fromRdfResource(resource, fromRdfResourceOptions)
                         .ifRight((object) => {
-                        resources.push({ object, objectType, resource });
+                        resources.push({ object, namedObjectType, resource });
                     })
                         .isRight()) {
                         break;
@@ -4782,18 +4849,18 @@ export class $RdfjsDatasetObjectSet {
         }
         let objectI = 0;
         const objects = [];
-        for (let { object, objectType, resource } of resources) {
+        for (let { object, namedObjectType, resource } of resources) {
             if (!object) {
                 let objectEither;
-                if (objectType) {
-                    objectEither = objectType.$fromRdfResource(resource, fromRdfResourceOptions);
+                if (namedObjectType) {
+                    objectEither = namedObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
                 }
                 else {
                     objectEither = Left(new Error("no object types"));
-                    for (const tryObjectType of objectTypes) {
+                    for (const tryObjectType of namedObjectTypes) {
                         objectEither = tryObjectType.$fromRdfResource(resource, fromRdfResourceOptions);
                         if (objectEither.isRight()) {
-                            objectType = tryObjectType;
+                            namedObjectType = tryObjectType;
                             break;
                         }
                     }
@@ -4803,10 +4870,10 @@ export class $RdfjsDatasetObjectSet {
                 }
                 object = objectEither.unsafeCoerce();
             }
-            if (!objectType) {
-                throw new Error("objectType should be set here");
+            if (!namedObjectType) {
+                throw new Error("namedObjectType should be set here");
             }
-            if (query?.filter && !objectType.$filter(query.filter, object)) {
+            if (query?.filter && !namedObjectType.$filter(query.filter, object)) {
                 continue;
             }
             if (objectI++ >= offset) {