@shaclmate/compiler 4.0.7 → 4.0.9

package/dist/generators/ts/imports.js

@@ -26,9 +26,9 @@ export const imports = {
     Maybe: imp("Maybe@purify-ts"),
     NamedNode: imp("NamedNode@@rdfjs/types"),
     NonEmptyList: imp("NonEmptyList@purify-ts"),
-    PropertyPath: imp("PropertyPath@rdfjs-resource"),
     Quad: imp("Quad@@rdfjs/types"),
     Quad_Graph: imp("Quad_Graph@@rdfjs/types"),
+    RdfjsResourcePropertyPath: imp("PropertyPath:RdfjsResourcePropertyPath@rdfjs-resource"),
     Resource: imp("Resource@rdfjs-resource"),
     ResourceSet: imp("ResourceSet@rdfjs-resource"),
     Right: imp("Right@purify-ts"),

package/dist/generators/ts/objectSetDeclarations.d.ts

@@ -1,8 +1,8 @@
+import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import type { ObjectType } from "./ObjectType.js";
-import type { ObjectUnionType } from "./ObjectUnionType.js";
 import type { Code } from "./ts-poet-wrapper.js";
-export declare function objectSetDeclarations({ objectUnionTypes, ...parameters }: {
+export declare function objectSetDeclarations({ namedObjectUnionTypes, ...parameters }: {
     objectTypes: readonly ObjectType[];
-    objectUnionTypes: readonly ObjectUnionType[];
+    namedObjectUnionTypes: readonly NamedObjectUnionType[];
 }): readonly Code[];
 //# sourceMappingURL=objectSetDeclarations.d.ts.map

package/dist/generators/ts/objectSetDeclarations.js

@@ -1,7 +1,7 @@
 import { objectSetInterfaceDeclaration } from "./objectSetInterfaceDeclaration.js";
 import { rdfjsDatasetObjectSetClassDeclaration } from "./rdfjsDatasetObjectSetClassDeclaration.js";
 import { sparqlObjectSetClassDeclaration } from "./sparqlObjectSetClassDeclaration.js";
-export function objectSetDeclarations({ objectUnionTypes, ...parameters }) {
+export function objectSetDeclarations({ namedObjectUnionTypes, ...parameters }) {
     const objectTypes = parameters.objectTypes.filter((objectType) => !objectType.abstract && !objectType.extern && !objectType.synthetic);
     let objectTypesWithRdfFeatureCount = 0;
     let objectTypesWithSparqlFeatureCount = 0;
@@ -16,42 +16,42 @@ export function objectSetDeclarations({ objectUnionTypes, ...parameters }) {
             objectTypesWithSparqlFeatureCount++;
         }
     }
-    let objectUnionTypesWithRdfFeatureCount = 0;
-    let objectUnionTypesWithSparqlFeatureCount = 0;
-    for (const objectUnionType of objectUnionTypes) {
-        if (!objectUnionType.features.has("rdf") &&
-            !objectUnionType.features.has("sparql")) {
+    let namedObjectUnionTypesWithRdfFeatureCount = 0;
+    let namedObjectUnionTypesWithSparqlFeatureCount = 0;
+    for (const namedObjectUnionType of namedObjectUnionTypes) {
+        if (!namedObjectUnionType.features.has("rdf") &&
+            !namedObjectUnionType.features.has("sparql")) {
             continue;
         }
-        if (objectUnionType.features.has("rdf")) {
-            objectUnionTypesWithRdfFeatureCount++;
+        if (namedObjectUnionType.features.has("rdf")) {
+            namedObjectUnionTypesWithRdfFeatureCount++;
         }
-        if (objectUnionType.features.has("sparql")) {
-            objectUnionTypesWithSparqlFeatureCount++;
+        if (namedObjectUnionType.features.has("sparql")) {
+            namedObjectUnionTypesWithSparqlFeatureCount++;
         }
     }
     if (objectTypesWithRdfFeatureCount === 0 &&
         objectTypesWithSparqlFeatureCount === 0 &&
-        objectUnionTypesWithRdfFeatureCount === 0 &&
-        objectUnionTypesWithSparqlFeatureCount === 0) {
+        namedObjectUnionTypesWithRdfFeatureCount === 0 &&
+        namedObjectUnionTypesWithSparqlFeatureCount === 0) {
         return [];
     }
     const declarations = [
         objectSetInterfaceDeclaration({
             objectTypes,
-            objectUnionTypes,
+            namedObjectUnionTypes,
         }),
     ];
     if (objectTypesWithRdfFeatureCount > 0) {
         declarations.push(rdfjsDatasetObjectSetClassDeclaration({
             objectTypes,
-            objectUnionTypes,
+            namedObjectUnionTypes,
         }));
     }
     if (objectTypesWithSparqlFeatureCount > 0) {
         declarations.push(sparqlObjectSetClassDeclaration({
             objectTypes,
-            objectUnionTypes,
+            namedObjectUnionTypes,
         }));
     }
     return declarations;

package/dist/generators/ts/objectSetInterfaceDeclaration.d.ts

@@ -1,8 +1,8 @@
+import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import type { ObjectType } from "./ObjectType.js";
-import type { ObjectUnionType } from "./ObjectUnionType.js";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare function objectSetInterfaceDeclaration({ objectTypes, objectUnionTypes, }: {
+export declare function objectSetInterfaceDeclaration({ objectTypes, namedObjectUnionTypes, }: {
     objectTypes: readonly ObjectType[];
-    objectUnionTypes: readonly ObjectUnionType[];
+    namedObjectUnionTypes: readonly NamedObjectUnionType[];
 }): Code;
 //# sourceMappingURL=objectSetInterfaceDeclaration.d.ts.map

package/dist/generators/ts/objectSetInterfaceDeclaration.js

@@ -2,12 +2,12 @@ import { imports } from "./imports.js";
 import { objectSetMethodSignatures } from "./objectSetMethodSignatures.js";
 import { syntheticNamePrefix } from "./syntheticNamePrefix.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
-export function objectSetInterfaceDeclaration({ objectTypes, objectUnionTypes, }) {
+export function objectSetInterfaceDeclaration({ objectTypes, namedObjectUnionTypes, }) {
     return code `\
 export interface ${syntheticNamePrefix}ObjectSet {
   ${joinCode(objectTypes
         .flatMap((objectType) => Object.values(objectSetMethodSignatures({ objectType })))
-        .concat(objectUnionTypes.flatMap((objectUnionType) => Object.values(objectSetMethodSignatures({ objectType: objectUnionType }))))
+        .concat(namedObjectUnionTypes.flatMap((namedObjectUnionType) => Object.values(objectSetMethodSignatures({ objectType: namedObjectUnionType }))))
         .map((methodSignature) => code `${methodSignature.name}(${methodSignature.parameters}): ${methodSignature.returnType};`), { on: "\n\n" })}
 }
 

package/dist/generators/ts/rdfjsDatasetObjectSetClassDeclaration.d.ts

@@ -1,8 +1,8 @@
+import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import type { ObjectType } from "./ObjectType.js";
-import type { ObjectUnionType } from "./ObjectUnionType.js";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare function rdfjsDatasetObjectSetClassDeclaration({ objectTypes, objectUnionTypes, }: {
+export declare function rdfjsDatasetObjectSetClassDeclaration({ objectTypes, namedObjectUnionTypes, }: {
     objectTypes: readonly ObjectType[];
-    objectUnionTypes: readonly ObjectUnionType[];
+    namedObjectUnionTypes: readonly NamedObjectUnionType[];
 }): Code;
 //# sourceMappingURL=rdfjsDatasetObjectSetClassDeclaration.d.ts.map

package/dist/generators/ts/rdfjsDatasetObjectSetClassDeclaration.js

@@ -1,15 +1,14 @@
-import { snippets_FromRdfOptions } from "./_snippets/snippets_FromRdfOptions.js";
 import { imports } from "./imports.js";
 import { objectSetMethodSignatures } from "./objectSetMethodSignatures.js";
 import { snippets } from "./snippets.js";
 import { syntheticNamePrefix } from "./syntheticNamePrefix.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 import { unsupportedObjectSetMethodDeclarations } from "./unsupportedObjectSetMethodDeclarations.js";
-export function rdfjsDatasetObjectSetClassDeclaration({ objectTypes, objectUnionTypes, }) {
+export function rdfjsDatasetObjectSetClassDeclaration({ objectTypes, namedObjectUnionTypes, }) {
     const objectTypeType = code `\
 {
   ${syntheticNamePrefix}filter: (filter: ObjectFilterT, value: ObjectT) => boolean;
-  ${syntheticNamePrefix}fromRdf: (resource: ${imports.Resource}, options?: ${snippets_FromRdfOptions}) => ${imports.Either}<Error, ObjectT>;
+  ${syntheticNamePrefix}fromRdfResource: ${snippets.FromRdfResourceFunction}<ObjectT>;
   ${syntheticNamePrefix}fromRdfTypes: readonly ${imports.NamedNode}[]
 }`;
     const parameters = {
@@ -42,7 +41,7 @@ export class ${syntheticNamePrefix}RdfjsDatasetObjectSet implements ${syntheticN
   }
 
   ${joinCode([
-        ...[...objectTypes, ...objectUnionTypes].flatMap((objectType) => {
+        ...[...objectTypes, ...namedObjectUnionTypes].flatMap((objectType) => {
             if (!objectType.features.has("rdf")) {
                 return Object.values(unsupportedObjectSetMethodDeclarations({
                     objectType,
@@ -91,7 +90,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
                 const fromRdfTypes = objectType.fromRdfTypeVariable
                     .toList()
                     .concat(objectType.descendantFromRdfTypeVariables);
-                return code `{ ${syntheticNamePrefix}filter: ${filterFunction}, ${syntheticNamePrefix}fromRdf: ${objectType.staticModuleName}.${syntheticNamePrefix}fromRdf, ${syntheticNamePrefix}fromRdfTypes: ${fromRdfTypes.length > 0 ? code `[${joinCode(fromRdfTypes, { on: ", " })}]` : "[]"} }`;
+                return code `{ ${syntheticNamePrefix}filter: ${filterFunction}, ${syntheticNamePrefix}fromRdfResource: ${objectType.staticModuleName}.${syntheticNamePrefix}fromRdfResource, ${syntheticNamePrefix}fromRdfTypes: ${fromRdfTypes.length > 0 ? code `[${joinCode(fromRdfTypes, { on: ", " })}]` : "[]"} }`;
             };
             switch (objectType.kind) {
                 case "ObjectType": {
@@ -100,13 +99,13 @@ ${methodSignatures.objects.name}Sync(${methodSignatures.objects.parameters}): ${
   return this.${syntheticNamePrefix}objectsSync<${objectType.name}, ${objectType.filterType}, ${objectType.identifierTypeAlias}>(${runtimeObjectType(objectType.filterFunction, objectType)}, query);
 }`);
                 }
-                case "ObjectUnionType":
+                case "NamedObjectUnionType":
                     return delegatingMethods.concat(code `\
 ${methodSignatures.objects.name}Sync(${methodSignatures.objects.parameters}): ${imports.Either}<Error, readonly ${objectType.name}[]> {
   return this.${syntheticNamePrefix}objectUnionsSync<${objectType.name}, ${objectType.filterType}, ${objectType.identifierTypeAlias}>([
-    ${joinCode(objectType.memberTypes
-                        .filter((memberType) => !memberType.abstract)
-                        .map((memberType) => runtimeObjectType(objectType.filterFunction, memberType)), { on: ", " })}
+    ${joinCode(objectType.members
+                        .filter((member) => !member.type.abstract)
+                        .map((member) => runtimeObjectType(objectType.filterFunction, member.type)), { on: ", " })}
   ], query);
 }`);
                 default:
@@ -126,7 +125,7 @@ protected ${syntheticNamePrefix}objectsSync<${typeParameters.ObjectT}, ${typePar
   let offset = query?.offset ?? 0;
   if (offset < 0) { offset = 0; }
 
-  const fromRdfOptions: ${snippets_FromRdfOptions} = { graph, objectSet: this, preferredLanguages: query?.preferredLanguages };
+  const fromRdfResourceOptions: Parameters<${snippets.FromRdfResourceFunction}<ObjectT>>[1] = { graph, objectSet: this, preferredLanguages: query?.preferredLanguages };
 
   let resources: { object?: ObjectT, resource: ${imports.Resource} }[];
   const resourceSet = this.${syntheticNamePrefix}resourceSet(); // Access once, in case it's instantiated lazily
@@ -169,7 +168,7 @@ protected ${syntheticNamePrefix}objectsSync<${typeParameters.ObjectT}, ${typePar
       identifierSet.add(quad.subject);
       const resource = resourceSet.resource(quad.subject);
       // Eagerly eliminate the majority of resources that won't match the object type
-      objectType.${syntheticNamePrefix}fromRdf(resource, fromRdfOptions).ifRight(object => {
+      objectType.${syntheticNamePrefix}fromRdfResource(resource, fromRdfResourceOptions).ifRight(object => {
         resources.push({ object, resource });
       });
     }
@@ -184,7 +183,7 @@ protected ${syntheticNamePrefix}objectsSync<${typeParameters.ObjectT}, ${typePar
   const objects: ObjectT[] = [];
   for (let { object, resource } of resources) {
     if (!object) {
-      const objectEither = objectType.${syntheticNamePrefix}fromRdf(resource, fromRdfOptions);
+      const objectEither = objectType.${syntheticNamePrefix}fromRdfResource(resource, fromRdfResourceOptions);
       if (objectEither.isLeft()) {
         return objectEither;
       }
@@ -206,7 +205,7 @@ protected ${syntheticNamePrefix}objectsSync<${typeParameters.ObjectT}, ${typePar
   }`,
             ]
             : []),
-        ...(objectUnionTypes.length > 0
+        ...(namedObjectUnionTypes.length > 0
             ? [
                 code `\
 protected ${syntheticNamePrefix}objectUnionsSync<${typeParameters.ObjectT}, ${typeParameters.ObjectFilterT}, ${typeParameters.ObjectIdentifierT}>(objectTypes: readonly ${objectTypeType}[], ${parameters.query}): ${imports.Either}<Error, readonly ObjectT[]> {
@@ -218,7 +217,7 @@ protected ${syntheticNamePrefix}objectUnionsSync<${typeParameters.ObjectT}, ${ty
   let offset = query?.offset ?? 0;
   if (offset < 0) { offset = 0; }
 
-  const fromRdfOptions: ${snippets_FromRdfOptions} = { graph, objectSet: this, preferredLanguages: query?.preferredLanguages };
+  const fromRdfResourceOptions: Parameters<${snippets.FromRdfResourceFunction}<ObjectT>>[1] = { graph, objectSet: this, preferredLanguages: query?.preferredLanguages };
 
   let resources: { object?: ObjectT, objectType?: ${objectTypeType}, resource: ${imports.Resource} }[];
   const resourceSet = this.${syntheticNamePrefix}resourceSet(); // Access once, in case it's instantiated lazily
@@ -264,7 +263,7 @@ protected ${syntheticNamePrefix}objectUnionsSync<${typeParameters.ObjectT}, ${ty
       // Eagerly eliminate the majority of resources that won't match the object types
       const resource = resourceSet.resource(quad.subject);
       for (const objectType of objectTypes) {
-        if (objectType.${syntheticNamePrefix}fromRdf(resource, fromRdfOptions).ifRight(object => {
+        if (objectType.${syntheticNamePrefix}fromRdfResource(resource, fromRdfResourceOptions).ifRight(object => {
           resources.push({ object, objectType, resource });
         }).isRight()) {
           break;
@@ -284,11 +283,11 @@ protected ${syntheticNamePrefix}objectUnionsSync<${typeParameters.ObjectT}, ${ty
     if (!object) {
       let objectEither: ${imports.Either}<Error, ObjectT>;
       if (objectType) {
-        objectEither = objectType.${syntheticNamePrefix}fromRdf(resource, fromRdfOptions);
+        objectEither = objectType.${syntheticNamePrefix}fromRdfResource(resource, fromRdfResourceOptions);
       } else {
         objectEither = ${imports.Left}(new Error("no object types"));
         for (const tryObjectType of objectTypes) {
-          objectEither = tryObjectType.${syntheticNamePrefix}fromRdf(resource, fromRdfOptions);
+          objectEither = tryObjectType.${syntheticNamePrefix}fromRdfResource(resource, fromRdfResourceOptions);
           if (objectEither.isRight()) {
             objectType = tryObjectType;
             break;

package/dist/generators/ts/snippets.d.ts

@@ -34,9 +34,12 @@ export declare const snippets: {
     filterNumeric: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     filterString: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     filterTerm: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    FromRdfOptions: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    FocusSparqlConstructTriplesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    FocusSparqlWherePatternsFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     fromRdfLanguageIn: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     fromRdfPreferredLanguages: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    FromRdfResourceFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    FromRdfResourceValuesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     Hasher: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     IdentifierFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     identifierFromString: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
@@ -71,7 +74,8 @@ export declare const snippets: {
     NumericFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     NumericSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     numericSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    PropertiesFromRdfParameters: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    PropertiesFromRdfResourceFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    PropertyPath: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     RdfVocabularies: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     shaclPropertyFromRdf: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     ShaclPropertySchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
@@ -80,16 +84,12 @@ export declare const snippets: {
     setSparqlConstructTriples: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     setSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     sortSparqlPatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    SparqlConstructTriplesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    SparqlConstructTriplesFunctionParameters: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     SparqlFilterPattern: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     sparqlInstancesOfPattern: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     SparqlPattern_isSolutionGenerating: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     SparqlPattern: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     sparqlPropertyPath: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     sparqlValueInPattern: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    SparqlWherePatternsFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    SparqlWherePatternsFunctionParameters: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     strictEquals: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     StringFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     StringSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
@@ -99,6 +99,10 @@ export declare const snippets: {
     TermSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     termSchemaSparqlPatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     termSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    ToRdfResourceFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    ToRdfResourceValuesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     UnwrapR: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    ValueSparqlConstructTriplesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    ValueSparqlWherePatternsFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
 };
 //# sourceMappingURL=snippets.d.ts.map

package/dist/generators/ts/snippets.js

@@ -21,7 +21,10 @@ import { snippets_decodeBigDecimalLiteral } from "./_snippets/snippets_decodeBig
 import { snippets_deduplicateSparqlPatterns } from "./_snippets/snippets_deduplicateSparqlPatterns.js";
 import { snippets_defaultValueSparqlWherePatterns } from "./_snippets/snippets_defaultValueSparqlWherePatterns.js";
 import { snippets_EqualsResult } from "./_snippets/snippets_EqualsResult.js";
-import { snippets_FromRdfOptions } from "./_snippets/snippets_FromRdfOptions.js";
+import { snippets_FocusSparqlConstructTriplesFunction } from "./_snippets/snippets_FocusSparqlConstructTriplesFunction.js";
+import { snippets_FocusSparqlWherePatternsFunction } from "./_snippets/snippets_FocusSparqlWherePatternsFunction.js";
+import { snippets_FromRdfResourceFunction } from "./_snippets/snippets_FromRdfResourceFunction.js";
+import { snippets_FromRdfResourceValuesFunction } from "./_snippets/snippets_FromRdfResourceValuesFunction.js";
 import { snippets_filterArray } from "./_snippets/snippets_filterArray.js";
 import { snippets_filterBigDecimal } from "./_snippets/snippets_filterBigDecimal.js";
 import { snippets_filterBlankNode } from "./_snippets/snippets_filterBlankNode.js";
@@ -70,16 +73,13 @@ import { snippets_NumericFilter } from "./_snippets/snippets_NumericFilter.js";
 import { snippets_NumericSchema } from "./_snippets/snippets_NumericSchema.js";
 import { snippets_normalizeSparqlWherePatterns } from "./_snippets/snippets_normalizeSparqlWherePatterns.js";
 import { snippets_numericSparqlWherePatterns } from "./_snippets/snippets_numericSparqlWherePatterns.js";
-import { snippets_PropertiesFromRdfParameters } from "./_snippets/snippets_PropertiesFromRdfParameters.js";
+import { snippets_PropertiesFromRdfResourceFunction } from "./_snippets/snippets_PropertiesFromRdfResourceFunction.js";
+import { snippets_PropertyPath } from "./_snippets/snippets_PropertyPath.js";
 import { snippets_RdfVocabularies } from "./_snippets/snippets_RdfVocabularies.js";
 import { snippets_ShaclPropertySchema } from "./_snippets/snippets_ShaclPropertySchema.js";
-import { snippets_SparqlConstructTriplesFunction } from "./_snippets/snippets_SparqlConstructTriplesFunction.js";
-import { snippets_SparqlConstructTriplesFunctionParameters } from "./_snippets/snippets_SparqlConstructTriplesFunctionParameters.js";
 import { snippets_SparqlFilterPattern } from "./_snippets/snippets_SparqlFilterPattern.js";
 import { snippets_SparqlPattern } from "./_snippets/snippets_SparqlPattern.js";
 import { snippets_SparqlPattern_isSolutionGenerating } from "./_snippets/snippets_SparqlPattern_isSolutionGenerating.js";
-import { snippets_SparqlWherePatternsFunction } from "./_snippets/snippets_SparqlWherePatternsFunction.js";
-import { snippets_SparqlWherePatternsFunctionParameters } from "./_snippets/snippets_SparqlWherePatternsFunctionParameters.js";
 import { snippets_StringFilter } from "./_snippets/snippets_StringFilter.js";
 import { snippets_StringSchema } from "./_snippets/snippets_StringSchema.js";
 import { snippets_setSparqlConstructTriples } from "./_snippets/snippets_setSparqlConstructTriples.js";
@@ -95,10 +95,14 @@ import { snippets_strictEquals } from "./_snippets/snippets_strictEquals.js";
 import { snippets_stringSparqlWherePatterns } from "./_snippets/snippets_stringSparqlWherePatterns.js";
 import { snippets_TermFilter } from "./_snippets/snippets_TermFilter.js";
 import { snippets_TermSchema } from "./_snippets/snippets_TermSchema.js";
+import { snippets_ToRdfResourceFunction } from "./_snippets/snippets_ToRdfResourceFunction.js";
+import { snippets_ToRdfResourceValuesFunction } from "./_snippets/snippets_ToRdfResourceValuesFunction.js";
 import { snippets_termFilterSparqlPatterns } from "./_snippets/snippets_termFilterSparqlPatterns.js";
 import { snippets_termSchemaSparqlPatterns } from "./_snippets/snippets_termSchemaSparqlPatterns.js";
 import { snippets_termSparqlWherePatterns } from "./_snippets/snippets_termSparqlWherePatterns.js";
 import { snippets_UnwrapR } from "./_snippets/snippets_UnwrapR.js";
+import { snippets_ValueSparqlConstructTriplesFunction } from "./_snippets/snippets_ValueSparqlConstructTriplesFunction.js";
+import { snippets_ValueSparqlWherePatternsFunction } from "./_snippets/snippets_ValueSparqlWherePatternsFunction.js";
 export const snippets = {
     arrayIntersection: snippets_arrayIntersection,
     arrayEquals: snippets_arrayEquals,
@@ -135,9 +139,12 @@ export const snippets = {
     filterNumeric: snippets_filterNumeric,
     filterString: snippets_filterString,
     filterTerm: snippets_filterTerm,
-    FromRdfOptions: snippets_FromRdfOptions,
+    FocusSparqlConstructTriplesFunction: snippets_FocusSparqlConstructTriplesFunction,
+    FocusSparqlWherePatternsFunction: snippets_FocusSparqlWherePatternsFunction,
     fromRdfLanguageIn: snippets_fromRdfLanguageIn,
     fromRdfPreferredLanguages: snippets_fromRdfPreferredLanguages,
+    FromRdfResourceFunction: snippets_FromRdfResourceFunction,
+    FromRdfResourceValuesFunction: snippets_FromRdfResourceValuesFunction,
     Hasher: snippets_Hasher,
     IdentifierFilter: snippets_IdentifierFilter,
     identifierFromString: snippets_identifierFromString,
@@ -172,7 +179,8 @@ export const snippets = {
     NumericFilter: snippets_NumericFilter,
     NumericSchema: snippets_NumericSchema,
     numericSparqlWherePatterns: snippets_numericSparqlWherePatterns,
-    PropertiesFromRdfParameters: snippets_PropertiesFromRdfParameters,
+    PropertiesFromRdfResourceFunction: snippets_PropertiesFromRdfResourceFunction,
+    PropertyPath: snippets_PropertyPath,
     RdfVocabularies: snippets_RdfVocabularies,
     shaclPropertyFromRdf: snippets_shaclPropertyFromRdf,
     ShaclPropertySchema: snippets_ShaclPropertySchema,
@@ -181,16 +189,12 @@ export const snippets = {
     setSparqlConstructTriples: snippets_setSparqlConstructTriples,
     setSparqlWherePatterns: snippets_setSparqlWherePatterns,
     sortSparqlPatterns: snippets_sortSparqlPatterns,
-    SparqlConstructTriplesFunction: snippets_SparqlConstructTriplesFunction,
-    SparqlConstructTriplesFunctionParameters: snippets_SparqlConstructTriplesFunctionParameters,
     SparqlFilterPattern: snippets_SparqlFilterPattern,
     sparqlInstancesOfPattern: snippets_sparqlInstancesOfPattern,
     SparqlPattern_isSolutionGenerating: snippets_SparqlPattern_isSolutionGenerating,
     SparqlPattern: snippets_SparqlPattern,
     sparqlPropertyPath: snippets_sparqlPropertyPath,
     sparqlValueInPattern: snippets_sparqlValueInPattern,
-    SparqlWherePatternsFunction: snippets_SparqlWherePatternsFunction,
-    SparqlWherePatternsFunctionParameters: snippets_SparqlWherePatternsFunctionParameters,
     strictEquals: snippets_strictEquals,
     StringFilter: snippets_StringFilter,
     StringSchema: snippets_StringSchema,
@@ -200,6 +204,10 @@ export const snippets = {
     TermSchema: snippets_TermSchema,
     termSchemaSparqlPatterns: snippets_termSchemaSparqlPatterns,
     termSparqlWherePatterns: snippets_termSparqlWherePatterns,
+    ToRdfResourceFunction: snippets_ToRdfResourceFunction,
+    ToRdfResourceValuesFunction: snippets_ToRdfResourceValuesFunction,
     UnwrapR: snippets_UnwrapR,
+    ValueSparqlConstructTriplesFunction: snippets_ValueSparqlConstructTriplesFunction,
+    ValueSparqlWherePatternsFunction: snippets_ValueSparqlWherePatternsFunction,
 };
 //# sourceMappingURL=snippets.js.map

package/dist/generators/ts/sparqlObjectSetClassDeclaration.d.ts

@@ -1,8 +1,8 @@
+import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import type { ObjectType } from "./ObjectType.js";
-import type { ObjectUnionType } from "./ObjectUnionType.js";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare function sparqlObjectSetClassDeclaration({ objectTypes, objectUnionTypes, }: {
+export declare function sparqlObjectSetClassDeclaration({ objectTypes, namedObjectUnionTypes, }: {
     objectTypes: readonly ObjectType[];
-    objectUnionTypes: readonly ObjectUnionType[];
+    namedObjectUnionTypes: readonly NamedObjectUnionType[];
 }): Code;
 //# sourceMappingURL=sparqlObjectSetClassDeclaration.d.ts.map

package/dist/generators/ts/sparqlObjectSetClassDeclaration.js

@@ -4,16 +4,15 @@ import { snippets } from "./snippets.js";
 import { syntheticNamePrefix } from "./syntheticNamePrefix.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 import { unsupportedObjectSetMethodDeclarations } from "./unsupportedObjectSetMethodDeclarations.js";
-export function sparqlObjectSetClassDeclaration({ objectTypes, objectUnionTypes, }) {
-    const sparqlWherePatternsFunctionType = code `(parameters: { filter: ObjectFilterT | undefined; focusIdentifier: ${imports.NamedNode} | ${imports.Variable}; ignoreRdfType: boolean; preferredLanguages: readonly string[] | undefined; variablePrefix: string; }) => readonly ${imports.sparqljs}.Pattern[]`;
+export function sparqlObjectSetClassDeclaration({ objectTypes, namedObjectUnionTypes, }) {
     const parameters = {
         constructObjectType: code `objectType: {\
-  ${syntheticNamePrefix}fromRdf: (resource: ${imports.Resource}, options: { graph?: Exclude<${imports.Quad_Graph}, ${imports.Variable}>; objectSet: ${syntheticNamePrefix}ObjectSet; preferredLanguages?: readonly string[]; }) => ${imports.Either}<Error, ObjectT>;
+  ${syntheticNamePrefix}focusSparqlWherePatterns: ${snippets.FocusSparqlWherePatternsFunction}<ObjectFilterT>;
+  ${syntheticNamePrefix}fromRdfResource:  ${snippets.FromRdfResourceFunction}<ObjectT>;
   ${syntheticNamePrefix}sparqlConstructQueryString: (parameters: { filter?: ObjectFilterT; subject: ${imports.NamedNode} | ${imports.Variable}; } & Omit<${imports.sparqljs}.ConstructQuery, "prefixes" | "queryType" | "type"> & ${imports.sparqljs}.GeneratorOptions) => string;
-  ${syntheticNamePrefix}sparqlWherePatterns: ${sparqlWherePatternsFunctionType};
 }`,
         query: code `query?: ${syntheticNamePrefix}SparqlObjectSet.Query<ObjectFilterT, ObjectIdentifierT>`,
-        selectObjectTypeType: code `objectType: { ${syntheticNamePrefix}sparqlWherePatterns: ${sparqlWherePatternsFunctionType} }`,
+        selectObjectTypeType: code `objectType: { ${syntheticNamePrefix}focusSparqlWherePatterns: ${snippets.FocusSparqlWherePatternsFunction}<ObjectFilterT> }`,
     };
     const typeParameters = {
         ObjectT: code `ObjectT extends { readonly $identifier: ObjectIdentifierT }`,
@@ -31,7 +30,7 @@ export class ${syntheticNamePrefix}SparqlObjectSet implements ${syntheticNamePre
     this.graph = options?.graph;
   }
 
-${joinCode([...objectTypes, ...objectUnionTypes].flatMap((objectType) => {
+${joinCode([...objectTypes, ...namedObjectUnionTypes].flatMap((objectType) => {
         if (!objectType.features.has("sparql")) {
             return Object.values(unsupportedObjectSetMethodDeclarations({
                 objectType,
@@ -162,7 +161,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
       const dataset = ${imports.datasetFactory}.dataset(quads.concat());
       const objects: ObjectT[] = [];
       for (const identifier of identifiers) {
-        objects.push(await liftEither(objectType.${syntheticNamePrefix}fromRdf(new ${imports.Resource}(dataset, identifier as ${imports.NamedNode}), { objectSet: this, preferredLanguages: query?.preferredLanguages })));
+        objects.push(await liftEither(objectType.${syntheticNamePrefix}fromRdfResource(new ${imports.Resource}(dataset, identifier as ${imports.NamedNode}), { objectSet: this, preferredLanguages: query?.preferredLanguages })));
       }
       return objects;
     });
@@ -211,7 +210,7 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
       patterns = patterns.concat(query.where(this.${syntheticNamePrefix}objectVariable));
     }
 
-    patterns = patterns.concat(objectType.${syntheticNamePrefix}sparqlWherePatterns({ filter: query?.filter, focusIdentifier: this.${syntheticNamePrefix}objectVariable, ignoreRdfType: false, preferredLanguages: query?.preferredLanguages, variablePrefix: this.${syntheticNamePrefix}objectVariable.value }));
+    patterns = patterns.concat(objectType.${syntheticNamePrefix}focusSparqlWherePatterns({ filter: query?.filter, focusIdentifier: this.${syntheticNamePrefix}objectVariable, ignoreRdfType: false, preferredLanguages: query?.preferredLanguages, variablePrefix: this.${syntheticNamePrefix}objectVariable.value }));
 
     patterns = ${snippets.normalizeSparqlWherePatterns}(patterns).concat();
 

package/dist/generators/ts/synthesizeUberObjectUnionType.d.ts

@@ -1,9 +1,9 @@
+import { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import type { ObjectType } from "./ObjectType.js";
-import { ObjectUnionType } from "./ObjectUnionType.js";
 /**
  * Synthesize the $Object union.
  */
 export declare function synthesizeUberObjectUnionType(parameters: {
     objectTypes: readonly ObjectType[];
-}): ObjectUnionType;
+}): NamedObjectUnionType;
 //# sourceMappingURL=synthesizeUberObjectUnionType.d.ts.map

package/dist/generators/ts/synthesizeUberObjectUnionType.js

@@ -1,14 +1,16 @@
 import { Maybe } from "purify-ts";
+import { invariant } from "ts-invariant";
 import { BlankNodeType } from "./BlankNodeType.js";
 import { IdentifierType } from "./IdentifierType.js";
 import { IriType } from "./IriType.js";
-import { ObjectUnionType } from "./ObjectUnionType.js";
+import { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 import { syntheticNamePrefix } from "./syntheticNamePrefix.js";
 /**
  * Synthesize the $Object union.
  */
 export function synthesizeUberObjectUnionType(parameters) {
     const objectTypes = parameters.objectTypes.filter((objectType) => !objectType.extern);
+    invariant(objectTypes.length > 0);
     const nodeKinds = objectTypes.reduce((nodeKinds, objectType) => {
         for (const nodeKind of objectType.identifierType.nodeKinds) {
             nodeKinds.add(nodeKind);
@@ -40,9 +42,8 @@ export function synthesizeUberObjectUnionType(parameters) {
                 break;
         }
     }
-    return new ObjectUnionType({
+    return new NamedObjectUnionType({
         comment: Maybe.empty(),
-        export_: true,
         features: objectTypes.reduce((features, objectType) => {
             for (const feature of objectType.features) {
                 features.add(feature);
@@ -52,8 +53,12 @@ export function synthesizeUberObjectUnionType(parameters) {
         }, new Set()),
         identifierType,
         label: Maybe.empty(),
-        memberTypes: objectTypes,
+        members: objectTypes.map((objectType) => ({
+            discriminantValue: Maybe.empty(),
+            type: objectType,
+        })),
         name: `${syntheticNamePrefix}Object`,
+        recursive: false,
     });
 }
 //# sourceMappingURL=synthesizeUberObjectUnionType.js.map

package/dist/input/NodeShape.d.ts

@@ -1,23 +1,23 @@
 import type { NamedNode } from "@rdfjs/types";
-import { NodeShape as ShaclCoreNodeShape } from "@shaclmate/shacl-ast";
+import { NodeShape as ShaclAstNodeShape } from "@shaclmate/shacl-ast";
 import { Either, type Maybe } from "purify-ts";
 import type { IdentifierMintingStrategy } from "../enums/IdentifierMintingStrategy.js";
 import type { TsObjectDeclarationType } from "../enums/TsObjectDeclarationType.js";
 import type * as generated from "./generated.js";
 import type { Ontology, PropertyGroup, PropertyShape, ShapesGraph } from "./index.js";
 import type { Shape } from "./Shape.js";
-export declare class NodeShape extends ShaclCoreNodeShape<any, Ontology, PropertyGroup, PropertyShape, Shape> {
+export declare class NodeShape extends ShaclAstNodeShape<any, Ontology, PropertyGroup, PropertyShape, Shape> {
     private readonly ancestorClassIris;
     private readonly childClassIris;
     private readonly descendantClassIris;
-    private readonly generatedShaclmateNodeShape;
+    private readonly generatedNodeShape;
     private readonly parentClassIris;
     readonly isClass: boolean;
     readonly isList: boolean;
     readonly kind = "NodeShape";
-    constructor({ ancestorClassIris, childClassIris, descendantClassIris, generatedShaclmateNodeShape, isClass, isList, parentClassIris, shapesGraph, }: {
+    constructor({ ancestorClassIris, childClassIris, descendantClassIris, generatedNodeShape, isClass, isList, parentClassIris, shapesGraph, }: {
         ancestorClassIris: readonly NamedNode[];
-        generatedShaclmateNodeShape: generated.ShaclmateNodeShape;
+        generatedNodeShape: generated.NodeShape;
         childClassIris: readonly NamedNode[];
         descendantClassIris: readonly NamedNode[];
         isClass: boolean;
@@ -31,7 +31,6 @@ export declare class NodeShape extends ShaclCoreNodeShape<any, Ontology, Propert
     get comment(): Maybe<string>;
     get descendantNodeShapes(): Either<Error, readonly NodeShape[]>;
     get discriminantValue(): Maybe<string>;
-    get export(): Maybe<boolean>;
     get extern(): Maybe<boolean>;
     get fromRdfType(): Maybe<NamedNode>;
     get identifierIn(): readonly NamedNode[];