@shaclmate/shacl-ast 4.0.19 → 4.0.21

package/dist/AbstractShapesGraph.d.ts

@@ -1,7 +1,7 @@
 import type PrefixMap from "@rdfjs/prefix-map/PrefixMap.js";
 import TermMap from "@rdfjs/term-map";
 import type { BlankNode, DatasetCore, NamedNode } from "@rdfjs/types";
-import { Resource, ResourceSet } from "@rdfx/resource";
+import { type Resource, ResourceSet } from "@rdfx/resource";
 import { Either } from "purify-ts";
 import type * as generated from "./generated.js";
 export declare abstract class AbstractShapesGraph<NodeShapeT extends generated.NodeShape, OntologyT extends generated.Ontology, PropertyGroupT extends generated.PropertyGroup, PropertyShapeT extends generated.PropertyShape> {

package/dist/AbstractShapesGraph.js

@@ -1,8 +1,9 @@
-import DataFactory from "@rdfjs/data-model";
-import DatasetFactory from "@rdfjs/dataset";
+import datasetFactory from "@rdfjs/dataset";
 import TermMap from "@rdfjs/term-map";
 import TermSet from "@rdfjs/term-set";
-import { Resource, ResourceSet } from "@rdfx/resource";
+import dataFactory from "@rdfx/data-factory";
+import { ResourceSet } from "@rdfx/resource";
+import { NTriplesTerm } from "@rdfx/string";
 import { owl, sh } from "@tpluscode/rdf-ns-builders";
 import { Either, Left } from "purify-ts";
 import { CurieFactory } from "./CurieFactory.js";
@@ -42,25 +43,25 @@ export class AbstractShapesGraph {
         const nodeShape = this.nodeShapesByIdentifier.get(identifier);
         return nodeShape
             ? Either.of(nodeShape)
-            : Left(new Error(`no such node shape ${Resource.Identifier.toString(identifier)}`));
+            : Left(new Error(`no such node shape ${identifier}`));
     }
     ontology(identifier) {
         const ontology = this.ontologiesByIdentifier.get(identifier);
         return ontology
             ? Either.of(ontology)
-            : Left(new Error(`no such ontology ${Resource.Identifier.toString(identifier)}`));
+            : Left(new Error(`no such ontology ${identifier}`));
     }
     propertyGroup(identifier) {
         const propertyGroup = this.propertyGroupsByIdentifier.get(identifier);
         return propertyGroup
             ? Either.of(propertyGroup)
-            : Left(new Error(`no such property group ${Resource.Identifier.toString(identifier)}`));
+            : Left(new Error(`no such property group ${identifier}`));
     }
     propertyShape(identifier) {
         const propertyShape = this.propertyShapesByIdentifier.get(identifier);
         return propertyShape
             ? Either.of(propertyShape)
-            : Left(new Error(`no such property shape ${Resource.Identifier.toString(identifier)}`));
+            : Left(new Error(`no such property shape ${identifier}`));
     }
     shape(identifier) {
         return this.nodeShape(identifier).alt(this.propertyShape(identifier));
@@ -69,7 +70,7 @@ export class AbstractShapesGraph {
      * Convert the shapes graph to a dataset.
      */
     toDataset() {
-        const dataset = DatasetFactory.dataset();
+        const dataset = datasetFactory.dataset();
         const resourceSet = new ResourceSet(dataset);
         for (const nodeShape of this.nodeShapes) {
             this.typeFunctions.NodeShape.$toRdfResource(nodeShape, { resourceSet });
@@ -96,43 +97,21 @@ export class AbstractShapesGraph {
      */
     toString(options) {
         const format = options?.format ?? "application/n-triples";
-        function termToString(term) {
-            switch (term.termType) {
-                case "NamedNode":
-                    return `<${term.value}>`;
-                case "BlankNode":
-                    return `_:${term.value}`;
-                case "Literal": {
-                    const escaped = term.value
-                        .replace(/\\/g, "\\\\")
-                        .replace(/"/g, '\\"')
-                        .replace(/\n/g, "\\n")
-                        .replace(/\r/g, "\\r");
-                    if (term.language)
-                        return `"${escaped}"@${term.language}`;
-                    if (term.datatype.value !== "http://www.w3.org/2001/XMLSchema#string")
-                        return `"${escaped}"^^<${term.datatype.value}>`;
-                    return `"${escaped}"`;
-                }
-                default:
-                    throw new Error(`unexpected term type: ${term.termType}`);
-            }
-        }
         const lines = [];
         switch (format) {
             case "application/n-quads": {
                 for (const quad of this.toDataset()) {
                     const graphString = quad.graph.termType === "DefaultGraph"
                         ? ""
-                        : ` ${termToString(quad.graph)}`;
-                    lines.push(`${termToString(quad.subject)} ${termToString(quad.predicate)} ${termToString(quad.object)}${graphString} .\n`);
+                        : ` ${NTriplesTerm.stringify(quad.graph)}`;
+                    lines.push(`${NTriplesTerm.stringify(quad.subject)} ${NTriplesTerm.stringify(quad.predicate)} ${NTriplesTerm.stringify(quad.object)}${graphString} .\n`);
                 }
                 break;
             }
             case "application/n-triples":
                 {
                     for (const quad of this.toDataset()) {
-                        lines.push(`${termToString(quad.subject)} ${termToString(quad.predicate)} ${termToString(quad.object)} .\n`);
+                        lines.push(`${NTriplesTerm.stringify(quad.subject)} ${NTriplesTerm.stringify(quad.predicate)} ${NTriplesTerm.stringify(quad.object)} .\n`);
                     }
                 }
                 break;
@@ -175,7 +154,7 @@ export class AbstractShapesGraph {
             let curieDataset;
             if (options?.prefixMap) {
                 const curieCache = new Map();
-                curieDataset = DatasetFactory.dataset();
+                curieDataset = datasetFactory.dataset();
                 const curieFactory = new CurieFactory({
                     prefixMap: options.prefixMap,
                 });
@@ -196,7 +175,7 @@ export class AbstractShapesGraph {
                     const curieSubject = termToCurie(quad.subject);
                     if (!Object.is(curieObject, quad.object) ||
                         !Object.is(curieSubject, quad.subject)) {
-                        curieDataset.add(DataFactory.quad(curieSubject, quad.predicate, curieObject, quad.graph));
+                        curieDataset.add(dataFactory.quad(curieSubject, quad.predicate, curieObject, quad.graph));
                     }
                     else {
                         curieDataset.add(quad);
@@ -329,7 +308,7 @@ export class AbstractShapesGraph {
                         addShapeNode(quad.object);
                         if (!options?.ignoreUndefinedShapes &&
                             !datasetHasMatch(quad.object)) {
-                            throw new Error(`undefined shape: ${Resource.Identifier.toString(quad.object)}`);
+                            throw new Error(`undefined shape: ${quad.object}`);
                         }
                     }
                 }
@@ -351,7 +330,7 @@ export class AbstractShapesGraph {
                             addShapeNode(identifier);
                             if (!options?.ignoreUndefinedShapes &&
                                 !datasetHasMatch(identifier)) {
-                                throw new Error(`undefined shape: ${Resource.Identifier.toString(identifier)}`);
+                                throw new Error(`undefined shape: ${identifier}`);
                             }
                         }
                     }