@shaclmate/compiler 4.0.24 → 4.0.26

package/dist/generators/ts/sparqlObjectSetClassDeclaration.js

@@ -14,6 +14,7 @@ export function sparqlObjectSetClassDeclaration({ namedObjectTypes, namedObjectU
         query: code `query?: ${syntheticNamePrefix}SparqlObjectSet.Query<ObjectFilterT, ObjectIdentifierT>`,
         selectObjectTypeType: code `namedObjectType: { ${syntheticNamePrefix}focusSparqlWherePatterns: ${snippets.FocusSparqlWherePatternsFunction}<ObjectFilterT> }`,
     };
+    const sparqlClientType = code `{ queryBindings: (query: string) => Promise<readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[]>; queryQuads: (query: string) => Promise<readonly ${imports.Quad}[]>; }`;
     const typeParameters = {
         ObjectT: code `ObjectT extends { readonly $identifier: () => ObjectIdentifierT }`,
         ObjectFilterT: code `ObjectFilterT`,
@@ -21,13 +22,15 @@ export function sparqlObjectSetClassDeclaration({ namedObjectTypes, namedObjectU
     };
     return code `\
 export class ${syntheticNamePrefix}SparqlObjectSet implements ${syntheticNamePrefix}ObjectSet {
-  protected readonly ${syntheticNamePrefix}countVariable = ${imports.dataFactory}.variable!("count");;
-  protected readonly graph?: Exclude<${imports.Quad_Graph}, ${imports.Variable}>;
-  protected readonly ${syntheticNamePrefix}objectVariable = ${imports.dataFactory}.variable!("object");
-  protected readonly ${syntheticNamePrefix}sparqlGenerator = new ${imports.sparqljs}.Generator();
-
-  constructor(protected readonly ${syntheticNamePrefix}sparqlClient: { queryBindings: (query: string) => Promise<readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[]>; queryQuads: (query: string) => Promise<readonly ${imports.Quad}[]>; }, options?: { graph?: Exclude<${imports.Quad_Graph}, ${imports.Variable}> }) {
-    this.graph = options?.graph;
+  readonly #countVariable = ${imports.dataFactory}.variable!("count");;
+  readonly #graph?: Exclude<${imports.Quad_Graph}, ${imports.Variable}>;
+  readonly #objectVariable = ${imports.dataFactory}.variable!("object");
+  readonly #sparqlClient: ${sparqlClientType};
+  readonly #sparqlGenerator = new ${imports.sparqljs}.Generator();
+
+  constructor(sparqlClient: ${sparqlClientType}, options?: { graph?: Exclude<${imports.Quad_Graph}, ${imports.Variable}> }) {
+    this.#graph = options?.graph;
+    this.#sparqlClient = sparqlClient;
   }
 
 ${joinCode([...namedObjectTypes, ...namedObjectUnionTypes].flatMap((namedObjectType) => {
@@ -40,7 +43,7 @@ ${joinCode([...namedObjectTypes, ...namedObjectUnionTypes].flatMap((namedObjectT
             namedObjectType,
             queryT: `${syntheticNamePrefix}SparqlObjectSet.Query`,
         });
-        const runtimeObjectType = namedObjectType.staticModuleName;
+        const runtimeObjectType = namedObjectType.name;
         return [
             code `\
 async ${methodSignatures.object.name}(${methodSignatures.object.parameters}): ${methodSignatures.object.returnType} {
@@ -48,20 +51,20 @@ async ${methodSignatures.object.name}(${methodSignatures.object.parameters}): ${
 }`,
             code `\
 async ${methodSignatures.objectCount.name}(${methodSignatures.objectCount.parameters}): ${methodSignatures.objectCount.returnType} {
-  return this.${syntheticNamePrefix}objectCount<${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
+  return this.#objectCount<${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
 }`,
             code `\
 async ${methodSignatures.objectIdentifiers.name}(${methodSignatures.objectIdentifiers.parameters}): ${methodSignatures.objectIdentifiers.returnType} {
-  return this.${syntheticNamePrefix}objectIdentifiers<${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
+  return this.#objectIdentifiers<${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
 }`,
             code `\
 async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}): ${methodSignatures.objects.returnType} {
-  return this.${syntheticNamePrefix}objects<${namedObjectType.name}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
+  return this.#objects<${namedObjectType.name}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType}, query);
 }`,
         ];
     }), { on: "\n\n" })}
 
-  protected ${syntheticNamePrefix}mapBindingsToCount(bindings: readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[], variable: string): ${imports.Either}<Error, number> {
+  #mapBindingsToCount(bindings: readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[], variable: string): ${imports.Either}<Error, number> {
     if (bindings.length === 0) {
       return ${imports.Left}(new Error("empty result rows"));
     }
@@ -82,7 +85,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
     return ${imports.Right}(parsedCount);
   }
 
-  protected ${syntheticNamePrefix}mapBindingsToIdentifiers(bindings: readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[], variable: string): readonly ${imports.NamedNode}[] {
+  #mapBindingsToIdentifiers(bindings: readonly Record<string, ${imports.BlankNode} | ${imports.Literal} | ${imports.NamedNode}>[], variable: string): readonly ${imports.NamedNode}[] {
     const identifiers: ${imports.NamedNode}[] = [];
     for (const bindings_ of bindings) {
       const identifier = bindings_[variable];
@@ -96,7 +99,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
     return identifiers;
   }
 
-  protected async ${syntheticNamePrefix}objectIdentifiers<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): Promise<${imports.Either}<Error, readonly ObjectIdentifierT[]>> {
+  async #objectIdentifiers<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): Promise<${imports.Either}<Error, readonly ObjectIdentifierT[]>> {
     if (query?.identifiers) {
       return ${imports.Right}(query.identifiers);
     }
@@ -111,41 +114,41 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
       offset = 0;
     }
 
-    const wherePatterns = this.${syntheticNamePrefix}wherePatterns(namedObjectType, query);
+    const wherePatterns = this.#wherePatterns(namedObjectType, query);
     if (wherePatterns.length === 0) {
       return ${imports.Left}(new Error("no SPARQL WHERE patterns for identifiers"));
     }
 
     const selectQueryString = \
-      this.${syntheticNamePrefix}sparqlGenerator.stringify({
+      this.#sparqlGenerator.stringify({
         distinct: true,
         limit: limit < Number.MAX_SAFE_INTEGER ? limit : undefined,
         offset,
-        order: query?.order ? query.order(this.${syntheticNamePrefix}objectVariable).concat() : [{ expression: this.${syntheticNamePrefix}objectVariable }],
+        order: query?.order ? query.order(this.#objectVariable).concat() : [{ expression: this.#objectVariable }],
         prefixes: {},
         queryType: "SELECT",
         type: "query",
-        variables: [this.${syntheticNamePrefix}objectVariable],
+        variables: [this.#objectVariable],
         where: wherePatterns.concat()
       });
       
     return ${imports.EitherAsync}(async () =>
-      this.${syntheticNamePrefix}mapBindingsToIdentifiers(
-        await this.${syntheticNamePrefix}sparqlClient.queryBindings(selectQueryString),
-        this.${syntheticNamePrefix}objectVariable.value,
+      this.#mapBindingsToIdentifiers(
+        await this.#sparqlClient.queryBindings(selectQueryString),
+        this.#objectVariable.value,
       ) as readonly ObjectIdentifierT[],
     );  
   }
 
-  protected async ${syntheticNamePrefix}objects<${typeParameters.ObjectT}, ${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.constructObjectType}, ${parameters.query}): Promise<${imports.Either}<Error, readonly ObjectT[]>> {
+  async #objects<${typeParameters.ObjectT}, ${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.constructObjectType}, ${parameters.query}): Promise<${imports.Either}<Error, readonly ObjectT[]>> {
     return ${imports.EitherAsync}(async ({ liftEither }) => {
-      const identifiers = await liftEither(await this.${syntheticNamePrefix}objectIdentifiers<ObjectFilterT, ObjectIdentifierT>(namedObjectType, query));
+      const identifiers = await liftEither(await this.#objectIdentifiers<ObjectFilterT, ObjectIdentifierT>(namedObjectType, query));
       if (identifiers.length === 0) {
         return [];
       }
 
       const constructQueryString = namedObjectType.${syntheticNamePrefix}sparqlConstructQueryString({
-        subject: this.${syntheticNamePrefix}objectVariable,
+        subject: this.#objectVariable,
         where: [{
           type: "values" as const,
           values: identifiers.map((identifier) => {
@@ -156,7 +159,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
         }]
       });
 
-      const quads = await this.${syntheticNamePrefix}sparqlClient.queryQuads(constructQueryString);
+      const quads = await this.#sparqlClient.queryQuads(constructQueryString);
 
       const dataset = ${imports.datasetFactory}.dataset(quads.concat());
       const objects: ObjectT[] = [];
@@ -167,14 +170,14 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
     });
   }
 
-  protected async ${syntheticNamePrefix}objectCount<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): Promise<${imports.Either}<Error, number>> {
-    const wherePatterns = this.${syntheticNamePrefix}wherePatterns(namedObjectType, query);
+  async #objectCount<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): Promise<${imports.Either}<Error, number>> {
+    const wherePatterns = this.#wherePatterns(namedObjectType, query);
     if (wherePatterns.length === 0) {
       return ${imports.Left}(new Error("no SPARQL WHERE patterns for count"));
     }
 
     const selectQueryString = \
-      this.${syntheticNamePrefix}sparqlGenerator.stringify({
+      this.#sparqlGenerator.stringify({
         prefixes: {},
         queryType: "SELECT",
         type: "query",
@@ -183,10 +186,10 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
             expression: {
               aggregation: "COUNT",
               distinct: true,
-              expression: this.${syntheticNamePrefix}objectVariable,
+              expression: this.#objectVariable,
               type: "aggregate",
             },
-            variable: this.${syntheticNamePrefix}countVariable,
+            variable: this.#countVariable,
           },
         ],
         where: wherePatterns.concat()
@@ -194,27 +197,27 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
 
     return ${imports.EitherAsync}(async ({ liftEither }) =>
       liftEither(
-        this.${syntheticNamePrefix}mapBindingsToCount(
-          await this.${syntheticNamePrefix}sparqlClient.queryBindings(selectQueryString),
-          this.${syntheticNamePrefix}countVariable.value,
+        this.#mapBindingsToCount(
+          await this.#sparqlClient.queryBindings(selectQueryString),
+          this.#countVariable.value,
         ),
       ),
     );
   }
 
-  protected ${syntheticNamePrefix}wherePatterns<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): readonly ${imports.sparqljs}.Pattern[] {
+  #wherePatterns<${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(${parameters.selectObjectTypeType}, ${parameters.query}): readonly ${imports.sparqljs}.Pattern[] {
     // Patterns should be most to least specific.
     let patterns: ${imports.sparqljs}.Pattern[] = [];
 
     if (query?.where) {
-      patterns = patterns.concat(query.where(this.${syntheticNamePrefix}objectVariable));
+      patterns = patterns.concat(query.where(this.#objectVariable));
     }
 
-    patterns = patterns.concat(namedObjectType.${syntheticNamePrefix}focusSparqlWherePatterns({ filter: query?.filter, focusIdentifier: this.${syntheticNamePrefix}objectVariable, ignoreRdfType: false, preferredLanguages: query?.preferredLanguages, variablePrefix: this.${syntheticNamePrefix}objectVariable.value }));
+    patterns = patterns.concat(namedObjectType.${syntheticNamePrefix}focusSparqlWherePatterns({ filter: query?.filter, focusIdentifier: this.#objectVariable, ignoreRdfType: false, preferredLanguages: query?.preferredLanguages, variablePrefix: this.#objectVariable.value }));
 
     patterns = ${snippets.normalizeSparqlWherePatterns}(patterns).concat();
 
-    const graph = query?.graph ?? this.graph;
+    const graph = query?.graph ?? this.#graph;
     if (graph) {
       switch (graph.termType) {
         case "DefaultGraph":

package/dist/input/ShapesGraph.d.ts

@@ -2,8 +2,8 @@ import { AbstractShapesGraph } from "@shaclmate/shacl-ast";
 import type { Either } from "purify-ts";
 import type { Logger } from "ts-log";
 import type { Ast } from "../ast/Ast.js";
-import type { TsFeature } from "../enums/TsFeature.js";
 import type { Generator } from "../generators/Generator.js";
+import type { TsFeature } from "../generators/ts/TsFeature.js";
 import * as generated from "./generated.js";
 export declare class ShapesGraph extends AbstractShapesGraph<generated.NodeShape, generated.Ontology, generated.PropertyGroup, generated.PropertyShape> {
     protected readonly typeFunctions: {

package/dist/input/generated.d.ts

@@ -165,7 +165,6 @@ export interface PropertyShape {
     readonly resolve: Maybe<BlankNode | NamedNode>;
     readonly shaclmateName: Maybe<string>;
     readonly uniqueLang: Maybe<boolean>;
-    readonly visibility: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private" | "http://purl.org/shaclmate/ontology#_Visibility_Protected" | "http://purl.org/shaclmate/ontology#_Visibility_Public">>;
     readonly xone: Maybe<readonly (BlankNode | NamedNode)[]>;
 }
 export declare namespace PropertyShape {
@@ -206,7 +205,6 @@ export declare namespace PropertyShape {
         readonly resolve?: Maybe<BlankNode | NamedNode> | (BlankNode | NamedNode) | string;
         readonly shaclmateName?: Maybe<string> | string;
         readonly uniqueLang?: Maybe<boolean> | boolean;
-        readonly visibility?: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private" | "http://purl.org/shaclmate/ontology#_Visibility_Protected" | "http://purl.org/shaclmate/ontology#_Visibility_Public">> | NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private" | "http://purl.org/shaclmate/ontology#_Visibility_Protected" | "http://purl.org/shaclmate/ontology#_Visibility_Public"> | "http://purl.org/shaclmate/ontology#_Visibility_Private" | "http://purl.org/shaclmate/ontology#_Visibility_Protected" | "http://purl.org/shaclmate/ontology#_Visibility_Public";
         readonly xone?: Maybe<readonly (BlankNode | NamedNode)[]> | readonly (BlankNode | NamedNode)[] | readonly string[];
     }): PropertyShape;
     type $Identifier = BlankNode | NamedNode;
@@ -252,7 +250,6 @@ export declare namespace PropertyShape {
         readonly resolve?: $MaybeFilter<$IdentifierFilter>;
         readonly shaclmateName?: $MaybeFilter<$StringFilter>;
         readonly uniqueLang?: $MaybeFilter<$BooleanFilter>;
-        readonly visibility?: $MaybeFilter<$IriFilter>;
         readonly xone?: $MaybeFilter<$CollectionFilter<$IdentifierFilter>>;
     };
     const $fromRdfResource: $FromRdfResourceFunction<PropertyShape>;
@@ -297,7 +294,6 @@ export declare namespace PropertyShape {
         resolve: Maybe<BlankNode | NamedNode>;
         shaclmateName: Maybe<string>;
         uniqueLang: Maybe<boolean>;
-        visibility: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private" | "http://purl.org/shaclmate/ontology#_Visibility_Protected" | "http://purl.org/shaclmate/ontology#_Visibility_Public">>;
         xone: Maybe<readonly (BlankNode | NamedNode)[]>;
     }>;
     const $schema: {
@@ -674,17 +670,6 @@ export declare namespace PropertyShape {
                 };
                 readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
             };
-            readonly visibility: {
-                readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Protected"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Public">)[];
-                    };
-                };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#visibility">;
-            };
             readonly xone: {
                 readonly kind: "Shacl";
                 readonly type: () => {
@@ -788,7 +773,6 @@ export interface Ontology {
     readonly tsFeatureExcludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     readonly tsFeatureIncludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     readonly tsImports: readonly string[];
-    readonly tsObjectDeclarationType: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">>;
 }
 export declare namespace Ontology {
     function $create(parameters?: {
@@ -798,7 +782,6 @@ export declare namespace Ontology {
         readonly tsFeatureExcludes?: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[] | readonly ("http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql")[];
         readonly tsFeatureIncludes?: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[] | readonly ("http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql")[];
         readonly tsImports?: readonly string[];
-        readonly tsObjectDeclarationType?: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">> | NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"> | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface";
     }): Ontology;
     type $Identifier = BlankNode | NamedNode;
     namespace $Identifier {
@@ -813,7 +796,6 @@ export declare namespace Ontology {
         readonly tsFeatureExcludes?: $CollectionFilter<$IriFilter>;
         readonly tsFeatureIncludes?: $CollectionFilter<$IriFilter>;
         readonly tsImports?: $CollectionFilter<$StringFilter>;
-        readonly tsObjectDeclarationType?: $MaybeFilter<$IriFilter>;
     };
     const $fromRdfResource: $FromRdfResourceFunction<Ontology>;
     const $fromRdfResourceValues: $FromRdfResourceValuesFunction<Ontology>;
@@ -827,7 +809,6 @@ export declare namespace Ontology {
         tsFeatureExcludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
         tsFeatureIncludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
         tsImports: readonly string[];
-        tsObjectDeclarationType: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">>;
     }>;
     const $schema: {
         readonly properties: {
@@ -896,17 +877,6 @@ export declare namespace Ontology {
                 };
                 readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
             };
-            readonly tsObjectDeclarationType: {
-                readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">)[];
-                    };
-                };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsObjectDeclarationType">;
-            };
         };
     };
     function $toRdfResource(_ontology: Ontology, options?: Parameters<$ToRdfResourceFunction<Ontology>>[1]): Resource;
@@ -917,7 +887,6 @@ export declare namespace Ontology {
 export interface NodeShape {
     readonly $identifier: () => NodeShape.$Identifier;
     readonly $type: "NodeShape";
-    readonly abstract: Maybe<boolean>;
     readonly and: Maybe<readonly (BlankNode | NamedNode)[]>;
     readonly classes: readonly NamedNode[];
     readonly closed: Maybe<boolean>;
@@ -956,14 +925,12 @@ export interface NodeShape {
     readonly tsFeatureExcludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     readonly tsFeatureIncludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     readonly tsImports: readonly string[];
-    readonly tsObjectDeclarationType: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">>;
     readonly types: readonly NamedNode[];
     readonly xone: Maybe<readonly (BlankNode | NamedNode)[]>;
 }
 export declare namespace NodeShape {
     function $create(parameters?: {
         readonly $identifier?: (() => NodeShape.$Identifier) | (BlankNode | NamedNode) | string;
-        readonly abstract?: Maybe<boolean> | boolean;
         readonly and?: Maybe<readonly (BlankNode | NamedNode)[]> | readonly (BlankNode | NamedNode)[] | readonly string[];
         readonly classes?: readonly NamedNode[] | readonly string[];
         readonly closed?: Maybe<boolean> | boolean;
@@ -1002,7 +969,6 @@ export declare namespace NodeShape {
         readonly tsFeatureExcludes?: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[] | readonly ("http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql")[];
         readonly tsFeatureIncludes?: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[] | readonly ("http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql")[];
         readonly tsImports?: readonly string[];
-        readonly tsObjectDeclarationType?: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">> | NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface"> | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface";
         readonly types?: readonly NamedNode[] | readonly string[];
         readonly xone?: Maybe<readonly (BlankNode | NamedNode)[]> | readonly (BlankNode | NamedNode)[] | readonly string[];
     }): NodeShape;
@@ -1014,7 +980,6 @@ export declare namespace NodeShape {
     function $filter(filter: NodeShape.$Filter, value: NodeShape): boolean;
     type $Filter = {
         readonly $identifier?: $IdentifierFilter;
-        readonly abstract?: $MaybeFilter<$BooleanFilter>;
         readonly and?: $MaybeFilter<$CollectionFilter<$IdentifierFilter>>;
         readonly classes?: $CollectionFilter<$IriFilter>;
         readonly closed?: $MaybeFilter<$BooleanFilter>;
@@ -1053,7 +1018,6 @@ export declare namespace NodeShape {
         readonly tsFeatureExcludes?: $CollectionFilter<$IriFilter>;
         readonly tsFeatureIncludes?: $CollectionFilter<$IriFilter>;
         readonly tsImports?: $CollectionFilter<$StringFilter>;
-        readonly tsObjectDeclarationType?: $MaybeFilter<$IriFilter>;
         readonly types?: $CollectionFilter<$IriFilter>;
         readonly xone?: $MaybeFilter<$CollectionFilter<$IdentifierFilter>>;
     };
@@ -1064,7 +1028,6 @@ export declare namespace NodeShape {
     const $propertiesFromRdfResource: $PropertiesFromRdfResourceFunction<{
         $identifier: BlankNode | NamedNode;
         $type: "NodeShape";
-        abstract: Maybe<boolean>;
         and: Maybe<readonly (BlankNode | NamedNode)[]>;
         classes: readonly NamedNode[];
         closed: Maybe<boolean>;
@@ -1103,7 +1066,6 @@ export declare namespace NodeShape {
         tsFeatureExcludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
         tsFeatureIncludes: readonly NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
         tsImports: readonly string[];
-        tsObjectDeclarationType: Maybe<NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class" | "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">>;
         types: readonly NamedNode[];
         xone: Maybe<readonly (BlankNode | NamedNode)[]>;
     }>;
@@ -1122,16 +1084,6 @@ export declare namespace NodeShape {
                     ownValues: string[];
                 };
             };
-            readonly abstract: {
-                readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Boolean";
-                    };
-                };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#abstract">;
-            };
             readonly and: {
                 readonly kind: "Shacl";
                 readonly type: () => {
@@ -1530,17 +1482,6 @@ export declare namespace NodeShape {
                 };
                 readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
             };
-            readonly tsObjectDeclarationType: {
-                readonly kind: "Shacl";
-                readonly type: () => {
-                    kind: "Maybe";
-                    item: () => {
-                        kind: "Iri";
-                        in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">)[];
-                    };
-                };
-                readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsObjectDeclarationType">;
-            };
             readonly types: {
                 readonly kind: "Shacl";
                 readonly type: () => {
@@ -1608,16 +1549,6 @@ export declare namespace Shape {
                                 ownValues: string[];
                             };
                         };
-                        readonly abstract: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#abstract">;
-                        };
                         readonly and: {
                             readonly kind: "Shacl";
                             readonly type: () => {
@@ -2016,17 +1947,6 @@ export declare namespace Shape {
                             };
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
                         };
-                        readonly tsObjectDeclarationType: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">)[];
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsObjectDeclarationType">;
-                        };
                         readonly types: {
                             readonly kind: "Shacl";
                             readonly type: () => {
@@ -2429,17 +2349,6 @@ export declare namespace Shape {
                             };
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
                         };
-                        readonly visibility: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Protected"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Public">)[];
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#visibility">;
-                        };
                         readonly xone: {
                             readonly kind: "Shacl";
                             readonly type: () => {
@@ -2796,16 +2705,6 @@ export declare namespace $Object {
                                 ownValues: string[];
                             };
                         };
-                        readonly abstract: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Boolean";
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#abstract">;
-                        };
                         readonly and: {
                             readonly kind: "Shacl";
                             readonly type: () => {
@@ -3204,17 +3103,6 @@ export declare namespace $Object {
                             };
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
                         };
-                        readonly tsObjectDeclarationType: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">)[];
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsObjectDeclarationType">;
-                        };
                         readonly types: {
                             readonly kind: "Shacl";
                             readonly type: () => {
@@ -3310,17 +3198,6 @@ export declare namespace $Object {
                             };
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsImport">;
                         };
-                        readonly tsObjectDeclarationType: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Interface">)[];
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#tsObjectDeclarationType">;
-                        };
                     };
                 };
             };
@@ -3740,17 +3617,6 @@ export declare namespace $Object {
                             };
                             readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#uniqueLang">;
                         };
-                        readonly visibility: {
-                            readonly kind: "Shacl";
-                            readonly type: () => {
-                                kind: "Maybe";
-                                item: () => {
-                                    kind: "Iri";
-                                    in: (import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Private"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Protected"> | import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#_Visibility_Public">)[];
-                                };
-                            };
-                            readonly path: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://purl.org/shaclmate/ontology#visibility">;
-                        };
                         readonly xone: {
                             readonly kind: "Shacl";
                             readonly type: () => {