@shaclmate/shacl-ast 4.0.20 → 4.0.22

package/dist/AbstractShapesGraph.js

@@ -71,7 +71,7 @@ export class AbstractShapesGraph {
      */
     toDataset() {
         const dataset = datasetFactory.dataset();
-        const resourceSet = new ResourceSet(dataset);
+        const resourceSet = new ResourceSet({ dataFactory, dataset });
         for (const nodeShape of this.nodeShapes) {
             this.typeFunctions.NodeShape.$toRdfResource(nodeShape, { resourceSet });
         }
@@ -185,7 +185,10 @@ export class AbstractShapesGraph {
             else {
                 curieDataset = dataset;
             }
-            const curieResourceSet = new ResourceSet(curieDataset);
+            const curieResourceSet = new ResourceSet({
+                dataFactory,
+                dataset: curieDataset,
+            });
             return Either.encase(() => {
                 function readGraph() {
                     const graphs = new TermSet();

package/dist/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";
@@ -2198,7 +2198,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;
@@ -3018,7 +3024,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/generated.js

@@ -1960,7 +1960,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);
@@ -2330,7 +2333,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);
@@ -2528,7 +2534,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);
@@ -4165,7 +4174,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);
@@ -4874,7 +4886,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

@@ -4,9 +4,9 @@
     "@rdfjs/term-map": "~2.0.2",
     "@rdfjs/term-set": "~2.0.3",
     "@rdfjs/types": "~2.0.1",
-    "@rdfx/data-factory": "0.0.11",
-    "@rdfx/resource": "0.0.11",
-    "@rdfx/string": "0.0.11",
+    "@rdfx/data-factory": "0.0.12",
+    "@rdfx/resource": "0.0.12",
+    "@rdfx/string": "0.0.12",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "@types/rdfjs__dataset": "~2.0.7",
     "@types/rdfjs__term-map": "~2.0.10",
@@ -44,5 +44,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.20"
+  "version": "4.0.22"
 }