@shaclmate/compiler 4.0.23 → 4.0.25

package/dist/input/generated.js

@@ -267,18 +267,23 @@ function $strictEquals(left, right) {
 export var PropertyShape;
 (function (PropertyShape) {
     function $create(parameters) {
+        const $identifierParameter = parameters.$identifier;
         let $identifier;
-        if (typeof parameters.$identifier === "object") {
-            $identifier = parameters.$identifier;
+        if (typeof $identifierParameter === "function") {
+            $identifier = $identifierParameter;
         }
-        else if (typeof parameters.$identifier === "string") {
-            $identifier = dataFactory.namedNode(parameters.$identifier);
+        else if (typeof $identifierParameter === "object") {
+            $identifier = () => $identifierParameter;
         }
-        else if (parameters.$identifier === undefined) {
-            $identifier = dataFactory.blankNode();
+        else if (typeof $identifierParameter === "string") {
+            $identifier = () => dataFactory.namedNode($identifierParameter);
+        }
+        else if ($identifierParameter === undefined) {
+            const $eagerIdentifier = dataFactory.blankNode();
+            $identifier = () => $eagerIdentifier;
         }
         else {
-            $identifier = parameters.$identifier;
+            $identifier = $identifierParameter;
         }
         const $type = "PropertyShape";
         let and;
@@ -834,22 +839,6 @@ export var PropertyShape;
         else {
             uniqueLang = parameters.uniqueLang;
         }
-        let visibility;
-        if (Maybe.isMaybe(parameters.visibility)) {
-            visibility = parameters.visibility;
-        }
-        else if (typeof parameters.visibility === "object") {
-            visibility = Maybe.of(parameters.visibility);
-        }
-        else if (typeof parameters.visibility === "string") {
-            visibility = Maybe.of(dataFactory.namedNode(parameters.visibility));
-        }
-        else if (parameters.visibility === undefined) {
-            visibility = Maybe.empty();
-        }
-        else {
-            visibility = parameters.visibility;
-        }
         let xone;
         if (Maybe.isMaybe(parameters.xone)) {
             xone = parameters.xone;
@@ -904,7 +893,6 @@ export var PropertyShape;
             resolve,
             shaclmateName,
             uniqueLang,
-            visibility,
             xone,
         };
     }
@@ -916,7 +904,7 @@ export var PropertyShape;
     })($Identifier = PropertyShape.$Identifier || (PropertyShape.$Identifier = {}));
     function $filter(filter, value) {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.and !== undefined &&
@@ -1059,10 +1047,6 @@ export var PropertyShape;
             !$filterMaybe($filterBoolean)(filter.uniqueLang, value.uniqueLang)) {
             return false;
         }
-        if (filter.visibility !== undefined &&
-            !$filterMaybe($filterIri)(filter.visibility, value.visibility)) {
-            return false;
-        }
         if (filter.xone !== undefined &&
             !$filterMaybe($filterArray($filterIdentifier))(filter.xone, value.xone)) {
             return false;
@@ -1081,7 +1065,7 @@ export var PropertyShape;
             ignoreRdfType,
             objectSet,
             preferredLanguages,
-        });
+        }).map($create);
     };
     PropertyShape.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
         .toResource()
@@ -1807,30 +1791,6 @@ export var PropertyShape;
                     value: Maybe.empty(),
                 })),
         }).chain((uniqueLang) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: PropertyShape.$schema
-                .properties
-                .visibility,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Private"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Protected"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Public"),
-            ])))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .$schema
-                        .properties
-                        .visibility
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((visibility) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: PropertyShape.$schema
@@ -1900,9 +1860,8 @@ export var PropertyShape;
             resolve,
             shaclmateName,
             uniqueLang,
-            visibility,
             xone,
-        })))))))))))))))))))))))))))))))))))))))));
+        }))))))))))))))))))))))))))))))))))))))));
     };
     PropertyShape.$schema = {
         properties: {
@@ -2217,21 +2176,6 @@ export var PropertyShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#uniqueLang"),
             },
-            visibility: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Private"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Protected"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_Visibility_Public"),
-                        ],
-                    }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#visibility"),
-            },
             xone: {
                 kind: "Shacl",
                 type: () => ({
@@ -2251,7 +2195,7 @@ export var PropertyShape;
                 dataFactory: dataFactory,
                 dataset: datasetFactory.dataset(),
             });
-        const resource = resourceSet.resource(_propertyShape.$identifier);
+        const resource = resourceSet.resource(_propertyShape.$identifier());
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"), options?.graph);
         }
@@ -2262,7 +2206,7 @@ export var PropertyShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -2273,7 +2217,7 @@ export var PropertyShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -2306,7 +2250,7 @@ export var PropertyShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -2317,7 +2261,7 @@ export var PropertyShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -2332,7 +2276,7 @@ export var PropertyShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -2343,7 +2287,7 @@ export var PropertyShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -2389,7 +2333,7 @@ export var PropertyShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -2400,7 +2344,7 @@ export var PropertyShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -2425,7 +2369,6 @@ export var PropertyShape;
             .flatMap((value) => [
             $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
         ]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#visibility"), _propertyShape.visibility.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), _propertyShape.xone.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
@@ -2433,7 +2376,7 @@ export var PropertyShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -2444,7 +2387,7 @@ export var PropertyShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -2453,7 +2396,7 @@ export var PropertyShape;
     PropertyShape.$toRdfResource = $toRdfResource;
     function $propertiesToStrings(_propertyShape) {
         return $compactRecord({
-            $identifier: _propertyShape.$identifier.toString(),
+            $identifier: _propertyShape.$identifier().toString(),
             label: _propertyShape.label.map((item) => item.toString()).extract(),
             name: _propertyShape.name.map((item) => item.toString()).extract(),
             path: $PropertyPath.$toString(_propertyShape.path),
@@ -2471,18 +2414,23 @@ export var PropertyShape;
 export var PropertyGroup;
 (function (PropertyGroup) {
     function $create(parameters) {
+        const $identifierParameter = parameters?.$identifier;
         let $identifier;
-        if (typeof parameters?.$identifier === "object") {
-            $identifier = parameters?.$identifier;
+        if (typeof $identifierParameter === "function") {
+            $identifier = $identifierParameter;
+        }
+        else if (typeof $identifierParameter === "object") {
+            $identifier = () => $identifierParameter;
         }
-        else if (typeof parameters?.$identifier === "string") {
-            $identifier = dataFactory.namedNode(parameters?.$identifier);
+        else if (typeof $identifierParameter === "string") {
+            $identifier = () => dataFactory.namedNode($identifierParameter);
         }
-        else if (parameters?.$identifier === undefined) {
-            $identifier = dataFactory.blankNode();
+        else if ($identifierParameter === undefined) {
+            const $eagerIdentifier = dataFactory.blankNode();
+            $identifier = () => $eagerIdentifier;
         }
         else {
-            $identifier = parameters?.$identifier;
+            $identifier = $identifierParameter;
         }
         const $type = "PropertyGroup";
         let comment;
@@ -2521,7 +2469,7 @@ export var PropertyGroup;
     })($Identifier = PropertyGroup.$Identifier || (PropertyGroup.$Identifier = {}));
     function $filter(filter, value) {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.comment !== undefined &&
@@ -2546,7 +2494,7 @@ export var PropertyGroup;
             ignoreRdfType,
             objectSet,
             preferredLanguages,
-        });
+        }).map($create);
     };
     PropertyGroup.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
         .toResource()
@@ -2655,7 +2603,7 @@ export var PropertyGroup;
                 dataFactory: dataFactory,
                 dataset: datasetFactory.dataset(),
             });
-        const resource = resourceSet.resource(_propertyGroup.$identifier);
+        const resource = resourceSet.resource(_propertyGroup.$identifier());
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), options?.graph);
         }
@@ -2670,7 +2618,7 @@ export var PropertyGroup;
     PropertyGroup.$toRdfResource = $toRdfResource;
     function $propertiesToStrings(_propertyGroup) {
         return $compactRecord({
-            $identifier: _propertyGroup.$identifier.toString(),
+            $identifier: _propertyGroup.$identifier().toString(),
             label: _propertyGroup.label.map((item) => item.toString()).extract(),
         });
     }
@@ -2683,18 +2631,23 @@ export var PropertyGroup;
 export var Ontology;
 (function (Ontology) {
     function $create(parameters) {
+        const $identifierParameter = parameters?.$identifier;
         let $identifier;
-        if (typeof parameters?.$identifier === "object") {
-            $identifier = parameters?.$identifier;
+        if (typeof $identifierParameter === "function") {
+            $identifier = $identifierParameter;
+        }
+        else if (typeof $identifierParameter === "object") {
+            $identifier = () => $identifierParameter;
         }
-        else if (typeof parameters?.$identifier === "string") {
-            $identifier = dataFactory.namedNode(parameters?.$identifier);
+        else if (typeof $identifierParameter === "string") {
+            $identifier = () => dataFactory.namedNode($identifierParameter);
         }
-        else if (parameters?.$identifier === undefined) {
-            $identifier = dataFactory.blankNode();
+        else if ($identifierParameter === undefined) {
+            const $eagerIdentifier = dataFactory.blankNode();
+            $identifier = () => $eagerIdentifier;
         }
         else {
-            $identifier = parameters?.$identifier;
+            $identifier = $identifierParameter;
         }
         const $type = "Ontology";
         let comment;
@@ -2759,23 +2712,6 @@ export var Ontology;
         else {
             tsImports = parameters?.tsImports;
         }
-        let tsObjectDeclarationType;
-        if (Maybe.isMaybe(parameters?.tsObjectDeclarationType)) {
-            tsObjectDeclarationType = parameters?.tsObjectDeclarationType;
-        }
-        else if (typeof parameters?.tsObjectDeclarationType === "object") {
-            tsObjectDeclarationType = Maybe.of(parameters?.tsObjectDeclarationType);
-        }
-        else if (typeof parameters?.tsObjectDeclarationType === "string") {
-            tsObjectDeclarationType = Maybe.of(dataFactory.namedNode(parameters?.tsObjectDeclarationType));
-        }
-        else if (parameters?.tsObjectDeclarationType === undefined) {
-            tsObjectDeclarationType = Maybe.empty();
-        }
-        else {
-            tsObjectDeclarationType =
-                parameters?.tsObjectDeclarationType;
-        }
         return {
             $identifier,
             $type,
@@ -2784,7 +2720,6 @@ export var Ontology;
             tsFeatureExcludes,
             tsFeatureIncludes,
             tsImports,
-            tsObjectDeclarationType,
         };
     }
     Ontology.$create = $create;
@@ -2795,7 +2730,7 @@ export var Ontology;
     })($Identifier = Ontology.$Identifier || (Ontology.$Identifier = {}));
     function $filter(filter, value) {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.comment !== undefined &&
@@ -2818,10 +2753,6 @@ export var Ontology;
             !$filterArray($filterString)(filter.tsImports, value.tsImports)) {
             return false;
         }
-        if (filter.tsObjectDeclarationType !== undefined &&
-            !$filterMaybe($filterIri)(filter.tsObjectDeclarationType, value.tsObjectDeclarationType)) {
-            return false;
-        }
         return true;
     }
     Ontology.$filter = $filter;
@@ -2836,7 +2767,7 @@ export var Ontology;
             ignoreRdfType,
             objectSet,
             preferredLanguages,
-        });
+        }).map($create);
     };
     Ontology.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
         .toResource()
@@ -2966,24 +2897,7 @@ export var Ontology;
                 propertyPath: Ontology.$schema.properties.tsImports.path,
                 value: valuesArray,
             })),
-        }).chain((tsImports) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: Ontology.$schema.properties.tsObjectDeclarationType,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"),
-            ])))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: Ontology.$schema.properties
-                        .tsObjectDeclarationType.path,
-                    value: Maybe.empty(),
-                })),
-        }).map((tsObjectDeclarationType) => ({
+        }).map((tsImports) => ({
             $identifier,
             $type,
             comment,
@@ -2991,8 +2905,7 @@ export var Ontology;
             tsFeatureExcludes,
             tsFeatureIncludes,
             tsImports,
-            tsObjectDeclarationType,
-        }))))))))));
+        })))))))));
     };
     Ontology.$schema = {
         properties: {
@@ -3075,20 +2988,6 @@ export var Ontology;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"),
             },
-            tsObjectDeclarationType: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"),
-                        ],
-                    }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsObjectDeclarationType"),
-            },
         },
     };
     function $toRdfResource(_ontology, options) {
@@ -3097,7 +2996,7 @@ export var Ontology;
                 dataFactory: dataFactory,
                 dataset: datasetFactory.dataset(),
             });
-        const resource = resourceSet.resource(_ontology.$identifier);
+        const resource = resourceSet.resource(_ontology.$identifier());
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), options?.graph);
         }
@@ -3110,13 +3009,12 @@ export var Ontology;
         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);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsObjectDeclarationType"), _ontology.tsObjectDeclarationType.toList(), options?.graph);
         return resource;
     }
     Ontology.$toRdfResource = $toRdfResource;
     function $propertiesToStrings(_ontology) {
         return $compactRecord({
-            $identifier: _ontology.$identifier.toString(),
+            $identifier: _ontology.$identifier().toString(),
             label: _ontology.label.map((item) => item.toString()).extract(),
         });
     }
@@ -3129,33 +3027,25 @@ export var Ontology;
 export var NodeShape;
 (function (NodeShape) {
     function $create(parameters) {
+        const $identifierParameter = parameters?.$identifier;
         let $identifier;
-        if (typeof parameters?.$identifier === "object") {
-            $identifier = parameters?.$identifier;
+        if (typeof $identifierParameter === "function") {
+            $identifier = $identifierParameter;
         }
-        else if (typeof parameters?.$identifier === "string") {
-            $identifier = dataFactory.namedNode(parameters?.$identifier);
+        else if (typeof $identifierParameter === "object") {
+            $identifier = () => $identifierParameter;
         }
-        else if (parameters?.$identifier === undefined) {
-            $identifier = dataFactory.blankNode();
+        else if (typeof $identifierParameter === "string") {
+            $identifier = () => dataFactory.namedNode($identifierParameter);
         }
-        else {
-            $identifier = parameters?.$identifier;
-        }
-        const $type = "NodeShape";
-        let abstract;
-        if (Maybe.isMaybe(parameters?.abstract)) {
-            abstract = parameters?.abstract;
-        }
-        else if (typeof parameters?.abstract === "boolean") {
-            abstract = Maybe.of(parameters?.abstract);
-        }
-        else if (parameters?.abstract === undefined) {
-            abstract = Maybe.empty();
+        else if ($identifierParameter === undefined) {
+            const $eagerIdentifier = dataFactory.blankNode();
+            $identifier = () => $eagerIdentifier;
         }
         else {
-            abstract = parameters?.abstract;
+            $identifier = $identifierParameter;
         }
+        const $type = "NodeShape";
         let and;
         if (Maybe.isMaybe(parameters?.and)) {
             and = parameters?.and;
@@ -3314,23 +3204,6 @@ export var NodeShape;
         else {
             hasValues = parameters?.hasValues;
         }
-        let identifierMintingStrategy;
-        if (Maybe.isMaybe(parameters?.identifierMintingStrategy)) {
-            identifierMintingStrategy = parameters?.identifierMintingStrategy;
-        }
-        else if (typeof parameters?.identifierMintingStrategy === "object") {
-            identifierMintingStrategy = Maybe.of(parameters?.identifierMintingStrategy);
-        }
-        else if (typeof parameters?.identifierMintingStrategy === "string") {
-            identifierMintingStrategy = Maybe.of(dataFactory.namedNode(parameters?.identifierMintingStrategy));
-        }
-        else if (parameters?.identifierMintingStrategy === undefined) {
-            identifierMintingStrategy = Maybe.empty();
-        }
-        else {
-            identifierMintingStrategy =
-                parameters?.identifierMintingStrategy;
-        }
         let ignoredProperties;
         if (Maybe.isMaybe(parameters?.ignoredProperties)) {
             ignoredProperties = parameters?.ignoredProperties;
@@ -3767,23 +3640,6 @@ export var NodeShape;
         else {
             tsImports = parameters?.tsImports;
         }
-        let tsObjectDeclarationType;
-        if (Maybe.isMaybe(parameters?.tsObjectDeclarationType)) {
-            tsObjectDeclarationType = parameters?.tsObjectDeclarationType;
-        }
-        else if (typeof parameters?.tsObjectDeclarationType === "object") {
-            tsObjectDeclarationType = Maybe.of(parameters?.tsObjectDeclarationType);
-        }
-        else if (typeof parameters?.tsObjectDeclarationType === "string") {
-            tsObjectDeclarationType = Maybe.of(dataFactory.namedNode(parameters?.tsObjectDeclarationType));
-        }
-        else if (parameters?.tsObjectDeclarationType === undefined) {
-            tsObjectDeclarationType = Maybe.empty();
-        }
-        else {
-            tsObjectDeclarationType =
-                parameters?.tsObjectDeclarationType;
-        }
         let types;
         if (parameters?.types === undefined) {
             types = [];
@@ -3816,7 +3672,6 @@ export var NodeShape;
         return {
             $identifier,
             $type,
-            abstract,
             and,
             classes,
             closed,
@@ -3828,7 +3683,6 @@ export var NodeShape;
             flags,
             fromRdfType,
             hasValues,
-            identifierMintingStrategy,
             ignoredProperties,
             in_,
             isDefinedBy,
@@ -3856,7 +3710,6 @@ export var NodeShape;
             tsFeatureExcludes,
             tsFeatureIncludes,
             tsImports,
-            tsObjectDeclarationType,
             types,
             xone,
         };
@@ -3869,11 +3722,7 @@ export var NodeShape;
     })($Identifier = NodeShape.$Identifier || (NodeShape.$Identifier = {}));
     function $filter(filter, value) {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
-            return false;
-        }
-        if (filter.abstract !== undefined &&
-            !$filterMaybe($filterBoolean)(filter.abstract, value.abstract)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.and !== undefined &&
@@ -3920,10 +3769,6 @@ export var NodeShape;
             !$filterArray($filterTerm)(filter.hasValues, value.hasValues)) {
             return false;
         }
-        if (filter.identifierMintingStrategy !== undefined &&
-            !$filterMaybe($filterIri)(filter.identifierMintingStrategy, value.identifierMintingStrategy)) {
-            return false;
-        }
         if (filter.ignoredProperties !== undefined &&
             !$filterMaybe($filterArray($filterIri))(filter.ignoredProperties, value.ignoredProperties)) {
             return false;
@@ -4032,10 +3877,6 @@ export var NodeShape;
             !$filterArray($filterString)(filter.tsImports, value.tsImports)) {
             return false;
         }
-        if (filter.tsObjectDeclarationType !== undefined &&
-            !$filterMaybe($filterIri)(filter.tsObjectDeclarationType, value.tsObjectDeclarationType)) {
-            return false;
-        }
         if (filter.types !== undefined &&
             !$filterArray($filterIri)(filter.types, value.types)) {
             return false;
@@ -4058,7 +3899,7 @@ export var NodeShape;
             ignoreRdfType,
             objectSet,
             preferredLanguages,
-        });
+        }).map($create);
     };
     NodeShape.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
         .toResource()
@@ -4101,19 +3942,6 @@ export var NodeShape;
             .chain((values) => values.chainMap((value) => value.toIdentifier()))
             .chain((values) => values.head())
             .chain(($identifier) => Right("NodeShape").chain(($type) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.$schema.properties.abstract,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toBoolean()))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.$schema.properties.abstract.path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((abstract) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema.properties.and,
@@ -4168,8 +3996,7 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape.$schema.properties.comment
-                        .path,
+                    propertyPath: PropertyShape.$schema.properties.comment.path,
                     value: Maybe.empty(),
                 })),
         }).chain((comment) => $shaclPropertyFromRdf({
@@ -4273,8 +4100,8 @@ export var NodeShape;
                             expectedValueType: "(NamedNode | Literal)",
                             focusResource: $resource,
                             propertyPath: PropertyShape.$schema
-                                .properties
-                                .hasValues.path,
+                                .properties.hasValues
+                                .path,
                         }));
                 }
             })))
@@ -4286,26 +4113,6 @@ export var NodeShape;
                 value: valuesArray,
             })),
         }).chain((hasValues) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.$schema.properties
-                .identifierMintingStrategy,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_BlankNode"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_SHA256"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_UUIDv4"),
-            ])))
-                .map((values) => values.length > 0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: NodeShape.$schema.properties
-                        .identifierMintingStrategy
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((identifierMintingStrategy) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema.properties.ignoredProperties,
@@ -4315,8 +4122,7 @@ export var NodeShape;
             })))
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
-                propertyPath: NodeShape.$schema
-                    .properties
+                propertyPath: NodeShape.$schema.properties
                     .ignoredProperties.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value.toIri()))))
@@ -4325,8 +4131,7 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: NodeShape.$schema
-                        .properties
+                    propertyPath: NodeShape.$schema.properties
                         .ignoredProperties.path,
                     value: Maybe.empty(),
                 })),
@@ -4340,10 +4145,8 @@ export var NodeShape;
             })))
                 .chain((valueLists) => valueLists.chainMap((valueList) => Right(Resource.Values.fromArray({
                 focusResource: $resource,
-                propertyPath: PropertyShape
-                    .$schema
-                    .properties.in_
-                    .path,
+                propertyPath: PropertyShape.$schema
+                    .properties.in_.path,
                 values: valueList.toArray(),
             })).chain((values) => values.chainMap((value) => value
                 .toTerm()
@@ -4360,8 +4163,7 @@ export var NodeShape;
                             propertyPath: PropertyShape
                                 .$schema
                                 .properties
-                                .in_
-                                .path,
+                                .in_.path,
                         }));
                 }
             })))))
@@ -4385,8 +4187,8 @@ export var NodeShape;
                 : Resource.Values.fromValue({
                     focusResource: $resource,
                     propertyPath: PropertyShape.$schema
-                        .properties
-                        .isDefinedBy.path,
+                        .properties.isDefinedBy
+                        .path,
                     value: Maybe.empty(),
                 })),
         }).chain((isDefinedBy) => $shaclPropertyFromRdf({
@@ -4400,8 +4202,7 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .$schema
+                    propertyPath: PropertyShape.$schema
                         .properties.label
                         .path,
                     value: Maybe.empty(),
@@ -4430,11 +4231,9 @@ export var NodeShape;
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
-                    propertyPath: PropertyShape
-                        .$schema
+                    propertyPath: PropertyShape.$schema
                         .properties
-                        .languageIn
-                        .path,
+                        .languageIn.path,
                     value: Maybe.empty(),
                 })),
         }).chain((languageIn) => $shaclPropertyFromRdf({
@@ -4450,8 +4249,7 @@ export var NodeShape;
                     propertyPath: PropertyShape
                         .$schema
                         .properties
-                        .maxCount
-                        .path,
+                        .maxCount.path,
                     value: Maybe.empty(),
                 })),
         }).chain((maxCount) => $shaclPropertyFromRdf({
@@ -4517,8 +4315,7 @@ export var NodeShape;
                 .minCount,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => values.chainMap((value) => value.toInt()))
-                .map((values) => values.length >
-                0
+                .map((values) => values.length > 0
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
@@ -4532,14 +4329,12 @@ export var NodeShape;
         }).chain((minCount) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
-                .properties
+            propertySchema: NodeShape.$schema.properties
                 .minExclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
                 .chain((values) => values.chainMap((value) => value.toLiteral()))
-                .map((values) => values.length >
-                0
+                .map((values) => values.length > 0
                 ? values.map((value) => Maybe.of(value))
                 : Resource.Values.fromValue({
                     focusResource: $resource,
@@ -4553,8 +4348,7 @@ export var NodeShape;
         }).chain((minExclusive) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
-            propertySchema: NodeShape.$schema
-                .properties
+            propertySchema: NodeShape.$schema.properties
                 .minInclusive,
             typeFromRdf: (resourceValues) => resourceValues
                 .chain((values) => $fromRdfPreferredLanguages(values, _$options.preferredLanguages))
@@ -4898,29 +4692,6 @@ export var NodeShape;
                 value: valuesArray,
             })),
         }).chain((tsImports) => $shaclPropertyFromRdf({
-            graph: _$options.graph,
-            resource: $resource,
-            propertySchema: NodeShape.$schema
-                .properties
-                .tsObjectDeclarationType,
-            typeFromRdf: (resourceValues) => resourceValues
-                .chain((values) => values.chainMap((value) => value.toIri([
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"),
-                dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"),
-            ])))
-                .map((values) => values.length >
-                0
-                ? values.map((value) => Maybe.of(value))
-                : Resource.Values.fromValue({
-                    focusResource: $resource,
-                    propertyPath: Ontology
-                        .$schema
-                        .properties
-                        .tsObjectDeclarationType
-                        .path,
-                    value: Maybe.empty(),
-                })),
-        }).chain((tsObjectDeclarationType) => $shaclPropertyFromRdf({
             graph: _$options.graph,
             resource: $resource,
             propertySchema: NodeShape.$schema
@@ -4973,7 +4744,6 @@ export var NodeShape;
         }).map((xone) => ({
             $identifier,
             $type,
-            abstract,
             and,
             classes,
             closed,
@@ -4985,7 +4755,6 @@ export var NodeShape;
             flags,
             fromRdfType,
             hasValues,
-            identifierMintingStrategy,
             ignoredProperties,
             in_,
             isDefinedBy,
@@ -5013,10 +4782,9 @@ export var NodeShape;
             tsFeatureExcludes,
             tsFeatureIncludes,
             tsImports,
-            tsObjectDeclarationType,
             types,
             xone,
-        })))))))))))))))))))))))))))))))))))))))))))))));
+        }))))))))))))))))))))))))))))))))))))))))))));
     };
     NodeShape.$schema = {
         properties: {
@@ -5031,14 +4799,6 @@ export var NodeShape;
                     ownValues: ["NodeShape"],
                 }),
             },
-            abstract: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({ kind: "Boolean" }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#abstract"),
-            },
             and: {
                 kind: "Shacl",
                 type: () => ({
@@ -5130,21 +4890,6 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"),
             },
-            identifierMintingStrategy: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_BlankNode"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_SHA256"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_UUIDv4"),
-                        ],
-                    }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#identifierMintingStrategy"),
-            },
             ignoredProperties: {
                 kind: "Shacl",
                 type: () => ({
@@ -5411,20 +5156,6 @@ export var NodeShape;
                 }),
                 path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"),
             },
-            tsObjectDeclarationType: {
-                kind: "Shacl",
-                type: () => ({
-                    kind: "Maybe",
-                    item: () => ({
-                        kind: "Iri",
-                        in: [
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"),
-                            dataFactory.namedNode("http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"),
-                        ],
-                    }),
-                }),
-                path: dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsObjectDeclarationType"),
-            },
             types: {
                 kind: "Shacl",
                 type: () => ({
@@ -5452,15 +5183,10 @@ export var NodeShape;
                 dataFactory: dataFactory,
                 dataset: datasetFactory.dataset(),
             });
-        const resource = resourceSet.resource(_nodeShape.$identifier);
+        const resource = resourceSet.resource(_nodeShape.$identifier());
         if (!options?.ignoreRdfType) {
             resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"), options?.graph);
         }
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#abstract"), _nodeShape.abstract
-            .toList()
-            .flatMap((value) => [
-            $literalFactory.boolean(value, $RdfVocabularies.xsd.boolean),
-        ]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#and"), _nodeShape.and.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
@@ -5468,7 +5194,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5479,7 +5205,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5509,7 +5235,6 @@ export var NodeShape;
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#flags"), _nodeShape.flags.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#fromRdfType"), _nodeShape.fromRdfType.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#hasValue"), _nodeShape.hasValues.flatMap((item) => [item]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#identifierMintingStrategy"), _nodeShape.identifierMintingStrategy.toList(), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#ignoredProperties"), _nodeShape.ignoredProperties.toList().flatMap((value) => [
             value.length > 0
                 ? value.reduce(({ currentSubListResource, listResource }, item, itemIndex, list) => {
@@ -5517,7 +5242,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5528,7 +5253,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5539,7 +5264,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5550,7 +5275,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5565,7 +5290,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5576,7 +5301,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5619,7 +5344,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5630,7 +5355,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5645,7 +5370,6 @@ export var NodeShape;
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureExclude"), _nodeShape.tsFeatureExcludes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsFeatureInclude"), _nodeShape.tsFeatureIncludes.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsImport"), _nodeShape.tsImports.flatMap((item) => [$literalFactory.string(item)]), options?.graph);
-        resource.add(dataFactory.namedNode("http://purl.org/shaclmate/ontology#tsObjectDeclarationType"), _nodeShape.tsObjectDeclarationType.toList(), options?.graph);
         resource.add($RdfVocabularies.rdf.type, _nodeShape.types.flatMap((item) => [item]), options?.graph);
         resource.add(dataFactory.namedNode("http://www.w3.org/ns/shacl#xone"), _nodeShape.xone.toList().flatMap((value) => [
             value.length > 0
@@ -5654,7 +5378,7 @@ export var NodeShape;
                         currentSubListResource = listResource;
                     }
                     else {
-                        const newSubListResource = resourceSet.resource(dataFactory.blankNode());
+                        const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
                         currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
                         currentSubListResource = newSubListResource;
                     }
@@ -5665,7 +5389,7 @@ export var NodeShape;
                     return { currentSubListResource, listResource };
                 }, {
                     currentSubListResource: null,
-                    listResource: resourceSet.resource(dataFactory.blankNode()),
+                    listResource: resourceSet.resource((() => dataFactory.blankNode())()),
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), options?.graph);
@@ -5674,7 +5398,7 @@ export var NodeShape;
     NodeShape.$toRdfResource = $toRdfResource;
     function $propertiesToStrings(_nodeShape) {
         return $compactRecord({
-            $identifier: _nodeShape.$identifier.toString(),
+            $identifier: _nodeShape.$identifier().toString(),
             label: _nodeShape.label.map((item) => item.toString()).extract(),
             shaclmateName: _nodeShape.shaclmateName
                 .map((item) => item.toString())
@@ -5691,7 +5415,7 @@ export var Shape;
 (function (Shape) {
     Shape.$filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.on?.["NodeShape"] !== undefined &&
@@ -6041,7 +5765,7 @@ export var $Object;
 (function ($Object) {
     $Object.$filter = (filter, value) => {
         if (filter.$identifier !== undefined &&
-            !$filterIdentifier(filter.$identifier, value.$identifier)) {
+            !$filterIdentifier(filter.$identifier, value.$identifier())) {
             return false;
         }
         if (filter.on?.["NodeShape"] !== undefined &&
@@ -6267,7 +5991,7 @@ export class $RdfjsDatasetObjectSet {
         return this.nodeShapeIdentifiersSync(query);
     }
     nodeShapeIdentifiersSync(query) {
-        return this.nodeShapesSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.nodeShapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async nodeShapes(query) {
         return this.nodeShapesSync(query);
@@ -6298,7 +6022,7 @@ export class $RdfjsDatasetObjectSet {
         return this.ontologyIdentifiersSync(query);
     }
     ontologyIdentifiersSync(query) {
-        return this.ontologiesSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.ontologiesSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async ontologies(query) {
         return this.ontologiesSync(query);
@@ -6329,7 +6053,7 @@ export class $RdfjsDatasetObjectSet {
         return this.propertyGroupIdentifiersSync(query);
     }
     propertyGroupIdentifiersSync(query) {
-        return this.propertyGroupsSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.propertyGroupsSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async propertyGroups(query) {
         return this.propertyGroupsSync(query);
@@ -6360,7 +6084,7 @@ export class $RdfjsDatasetObjectSet {
         return this.propertyShapeIdentifiersSync(query);
     }
     propertyShapeIdentifiersSync(query) {
-        return this.propertyShapesSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.propertyShapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async propertyShapes(query) {
         return this.propertyShapesSync(query);
@@ -6391,7 +6115,7 @@ export class $RdfjsDatasetObjectSet {
         return this.shapeIdentifiersSync(query);
     }
     shapeIdentifiersSync(query) {
-        return this.shapesSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.shapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async shapes(query) {
         return this.shapesSync(query);
@@ -6429,7 +6153,7 @@ export class $RdfjsDatasetObjectSet {
         return this.objectIdentifiersSync(query);
     }
     objectIdentifiersSync(query) {
-        return this.objectsSync(query).map((objects) => objects.map((object) => object.$identifier));
+        return this.objectsSync(query).map((objects) => objects.map((object) => object.$identifier()));
     }
     async objects(query) {
         return this.objectsSync(query);