@shaclmate/compiler 4.0.21 → 4.0.22

package/dist/generators/ts/_NamedObjectType/NamedObjectType_toRdfResourceFunctionOrMethodDeclaration.js

@@ -20,7 +20,7 @@ export function NamedObjectType_toRdfResourceFunctionOrMethodDeclaration() {
     }
     parameters.push(code `options?: Parameters<${snippets.ToRdfResourceFunction}<${this.name}>>[1]`);
     const statements = [
-        code `const ${variables.resourceSet} = options?.${variables.resourceSet} ?? new ${imports.ResourceSet}(${imports.datasetFactory}.dataset(), { dataFactory: ${imports.dataFactory} });`,
+        code `const ${variables.resourceSet} = options?.${variables.resourceSet} ?? new ${imports.ResourceSet}({ dataFactory: ${imports.dataFactory}, dataset: ${imports.datasetFactory}.dataset() });`,
     ];
     if (this.parentObjectTypes.length > 0) {
         const superToRdfOptions = code `{ ${variables.ignoreRdfType}: true, ${variables.graph}: options?.${variables.graph}, ${variables.resourceSet} }`;

package/dist/generators/ts/rdfjsDatasetObjectSetClassDeclaration.js

@@ -37,7 +37,7 @@ export class ${syntheticNamePrefix}RdfjsDatasetObjectSet implements ${syntheticN
   }
 
   protected ${syntheticNamePrefix}resourceSet(): ${imports.ResourceSet} {
-    return new ${imports.ResourceSet}(this.${syntheticNamePrefix}dataset(), { dataFactory: ${imports.dataFactory} });
+    return new ${imports.ResourceSet}({ dataFactory: ${imports.dataFactory}, dataset: this.${syntheticNamePrefix}dataset() });
   }
 
   ${joinCode([

package/dist/generators/ts/sparqlObjectSetClassDeclaration.js

@@ -161,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(namedObjectType.${syntheticNamePrefix}fromRdfResource(new ${imports.Resource}(dataset, identifier as ${imports.NamedNode}), { objectSet: this, preferredLanguages: query?.preferredLanguages })));
+        objects.push(await liftEither(namedObjectType.${syntheticNamePrefix}fromRdfResource(new ${imports.Resource}({ dataFactory: ${imports.dataFactory}, dataset: dataset, identifier: identifier as ${imports.NamedNode} }), { objectSet: this, preferredLanguages: query?.preferredLanguages })));
       }
       return objects;
     });

package/dist/input/generated.d.ts

@@ -80,13 +80,13 @@ export type $ToRdfResourceFunction<T> = (value: T, options?: {
     ignoreRdfType?: boolean;
     resourceSet?: ResourceSet;
 }) => Resource;
-export type $ToRdfResourceValuesFunction<T> = (value: T, options: {
+export type $ToRdfResourceValuesFunction<ValueT, ReturnT extends BlankNode | Literal | NamedNode = BlankNode | Literal | NamedNode> = (value: ValueT, options: {
     graph?: Exclude<Quad_Graph, Variable>;
     ignoreRdfType?: boolean;
     propertyPath: $PropertyPath;
     resource: Resource;
     resourceSet: ResourceSet;
-}) => (bigint | boolean | number | string | BlankNode | Literal | NamedNode)[];
+}) => ReturnT[];
 export interface PropertyShape {
     readonly $identifier: PropertyShape.$Identifier;
     readonly $type: "PropertyShape";
@@ -2695,7 +2695,13 @@ export declare namespace Shape {
         };
     };
     const $toRdfResource: $ToRdfResourceFunction<Shape>;
-    const $toRdfResourceValues: $ToRdfResourceValuesFunction<Shape>;
+    const $toRdfResourceValues: (value: Shape, _options: {
+        graph?: Exclude<Quad_Graph, Variable>;
+        ignoreRdfType?: boolean;
+        propertyPath: $PropertyPath;
+        resource: Resource;
+        resourceSet: ResourceSet;
+    }) => (BlankNode | NamedNode)[];
     function isShape(object: $Object): object is Shape;
 }
 export type $Object = NodeShape | Ontology | PropertyGroup | PropertyShape;
@@ -3733,7 +3739,13 @@ export declare namespace $Object {
         };
     };
     const $toRdfResource: $ToRdfResourceFunction<$Object>;
-    const $toRdfResourceValues: $ToRdfResourceValuesFunction<$Object>;
+    const $toRdfResourceValues: (value: $Object, _options: {
+        graph?: Exclude<Quad_Graph, Variable>;
+        ignoreRdfType?: boolean;
+        propertyPath: $PropertyPath;
+        resource: Resource;
+        resourceSet: ResourceSet;
+    }) => (BlankNode | NamedNode)[];
 }
 export interface $ObjectSet {
     nodeShape(identifier: NodeShape.$Identifier, options?: {

package/dist/input/generated.js

@@ -2166,7 +2166,10 @@ export var PropertyShape;
     };
     function $toRdfResource(_propertyShape, options) {
         const resourceSet = options?.resourceSet ??
-            new ResourceSet(datasetFactory.dataset(), { dataFactory: dataFactory });
+            new ResourceSet({
+                dataFactory: dataFactory,
+                dataset: datasetFactory.dataset(),
+            });
         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);
@@ -2546,7 +2549,10 @@ export var PropertyGroup;
     };
     function $toRdfResource(_propertyGroup, options) {
         const resourceSet = options?.resourceSet ??
-            new ResourceSet(datasetFactory.dataset(), { dataFactory: dataFactory });
+            new ResourceSet({
+                dataFactory: dataFactory,
+                dataset: datasetFactory.dataset(),
+            });
         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);
@@ -2974,7 +2980,10 @@ export var Ontology;
     };
     function $toRdfResource(_ontology, options) {
         const resourceSet = options?.resourceSet ??
-            new ResourceSet(datasetFactory.dataset(), { dataFactory: dataFactory });
+            new ResourceSet({
+                dataFactory: dataFactory,
+                dataset: datasetFactory.dataset(),
+            });
         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);
@@ -5315,7 +5324,10 @@ export var NodeShape;
     };
     function $toRdfResource(_nodeShape, options) {
         const resourceSet = options?.resourceSet ??
-            new ResourceSet(datasetFactory.dataset(), { dataFactory: dataFactory });
+            new ResourceSet({
+                dataFactory: dataFactory,
+                dataset: datasetFactory.dataset(),
+            });
         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);
@@ -6069,7 +6081,10 @@ export class $RdfjsDatasetObjectSet {
         return this.#dataset();
     }
     $resourceSet() {
-        return new ResourceSet(this.$dataset(), { dataFactory: dataFactory });
+        return new ResourceSet({
+            dataFactory: dataFactory,
+            dataset: this.$dataset(),
+        });
     }
     async nodeShape(identifier, options) {
         return this.nodeShapeSync(identifier, options);

package/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.21",
+    "@shaclmate/shacl-ast": "4.0.22",
     "@rdfjs/dataset": "~2.0.2",
     "@rdfjs/prefix-map": "~0.1.2",
     "@rdfjs/term-map": "~2.0.2",
     "@rdfjs/term-set": "~2.0.3",
     "@rdfjs/types": "~2.0.1",
-    "@rdfx/data-factory": "0.0.11",
-    "@rdfx/literal": "0.0.11",
-    "@rdfx/resource": "0.0.11",
-    "@rdfx/string": "0.0.11",
+    "@rdfx/data-factory": "0.0.12",
+    "@rdfx/literal": "0.0.12",
+    "@rdfx/resource": "0.0.12",
+    "@rdfx/string": "0.0.12",
     "@sindresorhus/base62": "~0.1.0",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "@types/rdfjs__dataset": "~2.0.7",
@@ -70,5 +70,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.21"
+  "version": "4.0.22"
 }