@shaclmate/compiler 4.0.100 → 4.0.102

package/dist/generators/ts/Imports.d.ts

@@ -6,6 +6,7 @@ export declare class Imports {
     readonly datasetFactory: import("ts-poet/build/Import.js").Import;
     readonly Either: import("ts-poet/build/Import.js").Import;
     readonly EitherAsync: import("ts-poet/build/Import.js").Import;
+    readonly expandIri: import("ts-poet/build/Import.js").Import;
     readonly GraphQLBigInt: import("ts-poet/build/Import.js").Import;
     readonly GraphQLBoolean: import("ts-poet/build/Import.js").Import;
     readonly GraphQLDate: import("ts-poet/build/Import.js").Import;

package/dist/generators/ts/Imports.js

@@ -7,6 +7,7 @@ export class Imports {
     datasetFactory = imp("datasetFactory@@rdfx/collection");
     Either = imp("Either@purify-ts");
     EitherAsync = imp("EitherAsync@purify-ts");
+    expandIri = imp("expandIri@@rdfx/curie");
     GraphQLBigInt = imp("BigInt:GraphQLBigInt@graphql-scalars");
     GraphQLBoolean = imp("GraphQLBoolean@graphql");
     GraphQLDate = imp("Date:GraphQLDate@graphql-scalars");

package/dist/generators/ts/Snippets.d.ts

@@ -190,7 +190,6 @@ export declare class Snippets {
     get iriFromJsonObject(): Snippet;
     get iriFromJsonString(): Snippet;
     get iriFromRdfResourceValues(): Snippet;
-    get iriFromString(): Snippet;
     get iriLiteralFromJsonObject(): Snippet;
     get iriLiteralFromJsonString(): Snippet;
     get iriSparqlWherePatterns(): Snippet;

package/dist/generators/ts/Snippets.js

@@ -184,7 +184,6 @@ import { snippets_intFromRdfResourceValues } from "./_snippets/snippets_intFromR
 import { snippets_iriFromJsonObject } from "./_snippets/snippets_iriFromJsonObject.js";
 import { snippets_iriFromJsonString } from "./_snippets/snippets_iriFromJsonString.js";
 import { snippets_iriFromRdfResourceValues } from "./_snippets/snippets_iriFromRdfResourceValues.js";
-import { snippets_iriFromString } from "./_snippets/snippets_iriFromString.js";
 import { snippets_iriLiteralFromJsonObject } from "./_snippets/snippets_iriLiteralFromJsonObject.js";
 import { snippets_iriLiteralFromJsonString } from "./_snippets/snippets_iriLiteralFromJsonString.js";
 import { snippets_iriSparqlWherePatterns } from "./_snippets/snippets_iriSparqlWherePatterns.js";
@@ -795,9 +794,6 @@ export class Snippets {
     get iriFromRdfResourceValues() {
         return this.snippet(snippets_iriFromRdfResourceValues);
     }
-    get iriFromString() {
-        return this.snippet(snippets_iriFromString);
-    }
     get iriLiteralFromJsonObject() {
         return this.snippet(snippets_iriLiteralFromJsonObject);
     }
@@ -1605,9 +1601,6 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "iriFromRdfResourceValues", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "iriFromString", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "iriLiteralFromJsonObject", null);

package/dist/generators/ts/_snippets/snippets_convertToIdentifier.js

@@ -5,7 +5,7 @@ function ${syntheticNamePrefix}convertToIdentifier<DefaultNamespaceT extends ${s
     case "object":
       return ${imports.Either}.of(value);
     case "string":
-      return ${snippets.iriFromString}(value, { defaultNamespace });
+      return ${imports.expandIri}(value, { dataFactory: ${imports.dataFactory}, defaultNamespace });
     case "undefined":
       return ${imports.Either}.of(${imports.dataFactory}.blankNode());
   }

package/dist/generators/ts/_snippets/snippets_convertToIdentifierProperty.js

@@ -9,7 +9,7 @@ function ${syntheticNamePrefix}convertToIdentifierProperty<DefaultNamespaceT ext
       return ${imports.Either}.of(() => captureIdentifier);
     }
     case "string":
-      return ${snippets.iriFromString}(identifier, { defaultNamespace }).map(iri => (() => iri));
+      return ${imports.expandIri}(identifier, { dataFactory: ${imports.dataFactory}, defaultNamespace }).map(iri => (() => iri));
     case "undefined": {
       const captureIdentifier = ${imports.dataFactory}.blankNode();
       return ${imports.Either}.of(() => captureIdentifier);

package/dist/generators/ts/_snippets/snippets_convertToIri.js

@@ -5,7 +5,7 @@ function ${syntheticNamePrefix}convertToIri<DefaultNamespaceT extends ${snippets
     case "object":
       return ${imports.Either}.of(value);
     case "string":
-      return ${snippets.iriFromString}(value, { defaultNamespace });
+      return ${imports.expandIri}(value, { dataFactory: ${imports.dataFactory}, defaultNamespace });
   }
 }`);
 //# sourceMappingURL=snippets_convertToIri.js.map

package/dist/generators/ts/_snippets/snippets_convertToIriIdentifierProperty.js

@@ -9,7 +9,7 @@ function ${syntheticNamePrefix}convertToIriIdentifierProperty<DefaultNamespaceT
       return ${imports.Either}.of(() => captureIdentifier);
     }
     case "string": {
-      return ${snippets.iriFromString}(identifier, { defaultNamespace }).map(iri => (() => iri));
+      return ${imports.expandIri}(identifier, { dataFactory: ${imports.dataFactory}, defaultNamespace }).map(iri => (() => iri));
     }
   }
 }`);

package/dist/generators/ts/_snippets/snippets_iriFromJsonString.js

@@ -1,6 +1,6 @@
 import { code, conditionalOutput } from "../ts-poet-wrapper.js";
 export const snippets_iriFromJsonString = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}iriFromJsonString`, code `\
 function ${syntheticNamePrefix}iriFromJsonString(jsonString: string, options: Parameters<${snippets.FromJsonFunction}<string, ${imports.NamedNode}, object>>[1]): ${imports.Either}<Error, ${imports.NamedNode}> {
-  return ${snippets.iriFromString}(jsonString, options);
+  return ${imports.expandIri}(jsonString, { ...options, dataFactory: ${imports.dataFactory} });
 }`);
 //# sourceMappingURL=snippets_iriFromJsonString.js.map

package/dist/input/ShapesGraph.js

@@ -1,5 +1,5 @@
 import { datasetFactory, TermMap } from "@rdfx/collection";
-import { Curie } from "@rdfx/curie";
+import { shrinkIri } from "@rdfx/curie";
 import dataFactory from "@rdfx/data-factory";
 import { ResourceSet } from "@rdfx/resource";
 import { AbstractShapesGraph } from "@shaclmate/shacl-ast";
@@ -31,7 +31,7 @@ export class ShapesGraph extends AbstractShapesGraph {
                 if (cachedCurie) {
                     return cachedCurie;
                 }
-                const curie = Curie.fromIri(term, {
+                const curie = shrinkIri(term, {
                     prefixMap: options.prefixMap,
                 }).extract();
                 if (curie) {