@shaclmate/shacl-ast 4.0.62 → 4.0.64

package/dist/shacl-ast.shaclmate.d.ts

@@ -179,7 +179,7 @@ export declare namespace NodeShape {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isNodeShape(object: $Object): object is NodeShape;
+    const isNodeShape: (object: $Object) => object is NodeShape;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#NodeShape">;
         readonly properties: {
@@ -586,7 +586,7 @@ export declare namespace Ontology {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isOntology(object: $Object): object is Ontology;
+    const isOntology: (object: $Object) => object is Ontology;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/2002/07/owl#Ontology">;
         readonly properties: {
@@ -650,7 +650,7 @@ export declare namespace PropertyGroup {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isPropertyGroup(object: $Object): object is PropertyGroup;
+    const isPropertyGroup: (object: $Object) => object is PropertyGroup;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#PropertyGroup">;
         readonly properties: {
@@ -846,7 +846,7 @@ export declare namespace PropertyShape {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isPropertyShape(object: $Object): object is PropertyShape;
+    const isPropertyShape: (object: $Object) => object is PropertyShape;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#PropertyShape">;
         readonly properties: {
@@ -1370,7 +1370,7 @@ export declare namespace ValidationReport {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isValidationReport(object: $Object): object is ValidationReport;
+    const isValidationReport: (object: $Object) => object is ValidationReport;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ValidationReport">;
         readonly properties: {
@@ -1541,7 +1541,7 @@ export declare namespace ValidationResult {
         const parse: (value: string) => Either<Error, import("@rdfx/string/dist/Identifier.js").Identifier>;
         const stringify: typeof NTriplesTerm.stringify;
     }
-    function isValidationResult(object: $Object): object is ValidationResult;
+    const isValidationResult: (object: $Object) => object is ValidationResult;
     const schema: {
         readonly fromRdfType: import("@rdfx/data-factory/dist/NamedNode.js").NamedNode<"http://www.w3.org/ns/shacl#ValidationResult">;
         readonly properties: {
@@ -1645,7 +1645,7 @@ export declare namespace Shape {
     }
     function isShape(object: $Object): object is Shape;
     const schema: {
-        readonly kind: "ObjectUnion";
+        readonly kind: "ObjectDiscriminatedUnion";
         readonly members: {
             readonly NodeShape: {
                 readonly discriminantValues: readonly ["NodeShape"];
@@ -2850,7 +2850,7 @@ export declare namespace $Object {
         const stringify: typeof NTriplesTerm.stringify;
     }
     const schema: {
-        readonly kind: "ObjectUnion";
+        readonly kind: "ObjectDiscriminatedUnion";
         readonly members: {
             readonly NodeShape: {
                 readonly discriminantValues: readonly ["NodeShape"];

package/dist/shacl-ast.shaclmate.js

@@ -146,7 +146,7 @@ function $listFromRdfResourceValues(itemFromRdfResourceValues) {
 }
 const $literalFactory = new LiteralFactory({ dataFactory: dataFactory });
 function $literalFromRdfResourceValues(values, options) {
-    return $termLikeFromRdfResourceValues(values, options).chain((values) => values.chainMap((value) => value.toLiteral()));
+    return $termLikeFromRdfResourceValues(values, options).chain((values) => values.chainMap((value) => value.toLiteral(options.schema.in)));
 }
 function $maybeFromRdfResourceValues(itemFromRdfResourceValues) {
     return (values, options) => itemFromRdfResourceValues(values, {
@@ -202,6 +202,7 @@ var $RdfVocabularies;
 (function ($RdfVocabularies) {
     $RdfVocabularies.rdf = {
         first: dataFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#first"),
+        langString: dataFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"),
         nil: dataFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"),
         rest: dataFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"),
         subject: dataFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#subject"),
@@ -286,7 +287,7 @@ function $termFromRdfResourceValues(values, options) {
         if (!schema.types.some((type) => term.termType === type)) {
             return Left(new Resource.MistypedValueError({
                 actualValue: term,
-                expectedValueType: "Term types",
+                expectedValueType: "BlankNode | Literal | NamedNode",
                 focusResource,
                 propertyPath,
             }));
@@ -691,10 +692,7 @@ export var NodeShape;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = NodeShape.Identifier || (NodeShape.Identifier = {}));
-    function isNodeShape(object) {
-        return object.$type === "NodeShape";
-    }
-    NodeShape.isNodeShape = isNodeShape;
+    NodeShape.isNodeShape = (object) => object.$type === "NodeShape";
     NodeShape.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"),
         properties: {
@@ -1245,10 +1243,7 @@ export var Ontology;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = Ontology.Identifier || (Ontology.Identifier = {}));
-    function isOntology(object) {
-        return object.$type === "Ontology";
-    }
-    Ontology.isOntology = isOntology;
+    Ontology.isOntology = (object) => object.$type === "Ontology";
     Ontology.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"),
         properties: {
@@ -1344,10 +1339,7 @@ export var PropertyGroup;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = PropertyGroup.Identifier || (PropertyGroup.Identifier = {}));
-    function isPropertyGroup(object) {
-        return object.$type === "PropertyGroup";
-    }
-    PropertyGroup.isPropertyGroup = isPropertyGroup;
+    PropertyGroup.isPropertyGroup = (object) => object.$type === "PropertyGroup";
     PropertyGroup.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"),
         properties: {
@@ -1795,10 +1787,7 @@ export var PropertyShape;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = PropertyShape.Identifier || (PropertyShape.Identifier = {}));
-    function isPropertyShape(object) {
-        return object.$type === "PropertyShape";
-    }
-    PropertyShape.isPropertyShape = isPropertyShape;
+    PropertyShape.isPropertyShape = (object) => object.$type === "PropertyShape";
     PropertyShape.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"),
         properties: {
@@ -2469,10 +2458,7 @@ export var ValidationReport;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = ValidationReport.Identifier || (ValidationReport.Identifier = {}));
-    function isValidationReport(object) {
-        return object.$type === "ValidationReport";
-    }
-    ValidationReport.isValidationReport = isValidationReport;
+    ValidationReport.isValidationReport = (object) => object.$type === "ValidationReport";
     ValidationReport.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationReport"),
         properties: {
@@ -2631,10 +2617,7 @@ export var ValidationResult;
         Identifier.parse = $parseIdentifier;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = ValidationResult.Identifier || (ValidationResult.Identifier = {}));
-    function isValidationResult(object) {
-        return object.$type === "ValidationResult";
-    }
-    ValidationResult.isValidationResult = isValidationResult;
+    ValidationResult.isValidationResult = (object) => object.$type === "ValidationResult";
     ValidationResult.schema = {
         fromRdfType: dataFactory.namedNode("http://www.w3.org/ns/shacl#ValidationResult"),
         properties: {
@@ -2789,7 +2772,7 @@ export var Shape;
     }
     Shape.isShape = isShape;
     Shape.schema = {
-        kind: "ObjectUnion",
+        kind: "ObjectDiscriminatedUnion",
         members: {
             NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
             PropertyShape: {
@@ -3166,7 +3149,7 @@ export var $Object;
         Identifier.stringify = NTriplesTerm.stringify;
     })(Identifier = $Object.Identifier || ($Object.Identifier = {}));
     $Object.schema = {
-        kind: "ObjectUnion",
+        kind: "ObjectDiscriminatedUnion",
         members: {
             NodeShape: { discriminantValues: ["NodeShape"], type: NodeShape.schema },
             Ontology: { discriminantValues: ["Ontology"], type: Ontology.schema },

package/package.json

@@ -58,5 +58,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.62"
+  "version": "4.0.64"
 }