@shaclmate/compiler 4.0.7 → 4.0.9

package/dist/input/NodeShape.js

@@ -4,22 +4,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { NodeShape as ShaclCoreNodeShape } from "@shaclmate/shacl-ast";
+import { NodeShape as ShaclAstNodeShape } from "@shaclmate/shacl-ast";
 import { rdf } from "@tpluscode/rdf-ns-builders";
 import { Either, List } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
-export class NodeShape extends ShaclCoreNodeShape {
+export class NodeShape extends ShaclAstNodeShape {
     ancestorClassIris;
     childClassIris;
     descendantClassIris;
-    generatedShaclmateNodeShape;
+    generatedNodeShape;
     parentClassIris;
     isClass;
     isList;
     kind = "NodeShape";
-    constructor({ ancestorClassIris, childClassIris, descendantClassIris, generatedShaclmateNodeShape, isClass, isList, parentClassIris, shapesGraph, }) {
-        super(generatedShaclmateNodeShape, shapesGraph);
+    constructor({ ancestorClassIris, childClassIris, descendantClassIris, generatedNodeShape, isClass, isList, parentClassIris, shapesGraph, }) {
+        super(generatedNodeShape, shapesGraph);
         if (ancestorClassIris.length > 0 ||
             childClassIris.length > 0 ||
             descendantClassIris.length > 0 ||
@@ -30,13 +30,13 @@ export class NodeShape extends ShaclCoreNodeShape {
         this.ancestorClassIris = ancestorClassIris;
         this.childClassIris = childClassIris;
         this.descendantClassIris = descendantClassIris;
-        this.generatedShaclmateNodeShape = generatedShaclmateNodeShape;
+        this.generatedNodeShape = generatedNodeShape;
         this.isClass = isClass;
         this.isList = isList;
         this.parentClassIris = parentClassIris;
     }
     get abstract() {
-        return this.generatedShaclmateNodeShape.abstract;
+        return this.generatedNodeShape.abstract;
     }
     get ancestorNodeShapes() {
         return Either.sequence(this.ancestorClassIris
@@ -53,22 +53,19 @@ export class NodeShape extends ShaclCoreNodeShape {
         return Either.sequence(this.descendantClassIris.flatMap((classIri) => this.shapesGraph.nodeShapeByIdentifier(classIri)));
     }
     get discriminantValue() {
-        return this.generatedShaclmateNodeShape.discriminantValue;
-    }
-    get export() {
-        return this.generatedShaclmateNodeShape.export_;
+        return this.generatedNodeShape.discriminantValue;
     }
     get extern() {
-        return this.generatedShaclmateNodeShape.extern;
+        return this.generatedNodeShape.extern;
     }
     get fromRdfType() {
-        return this.generatedShaclmateNodeShape.fromRdfType;
+        return this.generatedNodeShape.fromRdfType;
     }
     get identifierIn() {
         return this.constraints.in_.filter((value) => value.termType === "NamedNode");
     }
     get identifierMintingStrategy() {
-        return this.generatedShaclmateNodeShape.identifierMintingStrategy.map((iri) => {
+        return this.generatedNodeShape.identifierMintingStrategy.map((iri) => {
             switch (iri.value) {
                 case "http://purl.org/shaclmate/ontology#_IdentifierMintingStrategy_BlankNode":
                     return "blankNode";
@@ -86,7 +83,7 @@ export class NodeShape extends ShaclCoreNodeShape {
         return List.head(this.labels);
     }
     get mutable() {
-        return this.generatedShaclmateNodeShape.mutable;
+        return this.generatedNodeShape.mutable;
     }
     get parentNodeShapes() {
         return Either.sequence(this.parentClassIris
@@ -94,25 +91,25 @@ export class NodeShape extends ShaclCoreNodeShape {
             .map((classIri) => this.shapesGraph.nodeShapeByIdentifier(classIri)));
     }
     get rdfType() {
-        return this.generatedShaclmateNodeShape.rdfType;
+        return this.generatedNodeShape.rdfType;
     }
     get shaclmateName() {
-        return this.generatedShaclmateNodeShape.name;
+        return this.generatedNodeShape.name;
     }
     get toRdfTypes() {
-        return this.generatedShaclmateNodeShape.toRdfTypes;
+        return this.generatedNodeShape.toRdfTypes;
     }
     get tsFeatureExcludes() {
-        return this.generatedShaclmateNodeShape.tsFeatureExcludes;
+        return this.generatedNodeShape.tsFeatureExcludes;
     }
     get tsFeatureIncludes() {
-        return this.generatedShaclmateNodeShape.tsFeatureIncludes;
+        return this.generatedNodeShape.tsFeatureIncludes;
     }
     get tsImports() {
-        return this.generatedShaclmateNodeShape.tsImports;
+        return this.generatedNodeShape.tsImports;
     }
     get tsObjectDeclarationType() {
-        return this.generatedShaclmateNodeShape.tsObjectDeclarationType.map((iri) => {
+        return this.generatedNodeShape.tsObjectDeclarationType.map((iri) => {
             switch (iri.value) {
                 case "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class":
                     return "class";

package/dist/input/Ontology.d.ts

@@ -1,10 +1,10 @@
-import { Ontology as OwlOntology } from "@shaclmate/shacl-ast";
+import { Ontology as ShaclAstOntology } from "@shaclmate/shacl-ast";
 import type { Maybe } from "purify-ts";
 import type { TsObjectDeclarationType } from "../enums/TsObjectDeclarationType.js";
 import type * as generated from "./generated.js";
-export declare class Ontology extends OwlOntology {
-    private readonly generatedShaclmateOntology;
-    constructor(generatedShaclmateOntology: generated.ShaclmateOntology);
+export declare class Ontology extends ShaclAstOntology {
+    private readonly _generatedOntology;
+    constructor(_generatedOntology: generated.Ontology);
     get tsFeatureExcludes(): readonly import("@rdfjs/types").NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     get tsFeatureIncludes(): readonly import("@rdfjs/types").NamedNode<"http://purl.org/shaclmate/ontology#_TsFeatures_All" | "http://purl.org/shaclmate/ontology#_TsFeature_Create" | "http://purl.org/shaclmate/ontology#_TsFeatures_Default" | "http://purl.org/shaclmate/ontology#_TsFeature_Equals" | "http://purl.org/shaclmate/ontology#_TsFeature_Graphql" | "http://purl.org/shaclmate/ontology#_TsFeature_Hash" | "http://purl.org/shaclmate/ontology#_TsFeature_Json" | "http://purl.org/shaclmate/ontology#_TsFeatures_None" | "http://purl.org/shaclmate/ontology#_TsFeature_Rdf" | "http://purl.org/shaclmate/ontology#_TsFeature_Sparql">[];
     get tsImports(): readonly string[];

package/dist/input/Ontology.js

@@ -4,25 +4,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { Ontology as OwlOntology } from "@shaclmate/shacl-ast";
+import { Ontology as ShaclAstOntology } from "@shaclmate/shacl-ast";
 import { Memoize } from "typescript-memoize";
-export class Ontology extends OwlOntology {
-    generatedShaclmateOntology;
-    constructor(generatedShaclmateOntology) {
-        super(generatedShaclmateOntology);
-        this.generatedShaclmateOntology = generatedShaclmateOntology;
+export class Ontology extends ShaclAstOntology {
+    _generatedOntology;
+    constructor(_generatedOntology) {
+        super(_generatedOntology);
+        this._generatedOntology = _generatedOntology;
     }
     get tsFeatureExcludes() {
-        return this.generatedShaclmateOntology.tsFeatureExcludes;
+        return this._generatedOntology.tsFeatureExcludes;
     }
     get tsFeatureIncludes() {
-        return this.generatedShaclmateOntology.tsFeatureIncludes;
+        return this._generatedOntology.tsFeatureIncludes;
     }
     get tsImports() {
-        return this.generatedShaclmateOntology.tsImports;
+        return this._generatedOntology.tsImports;
     }
     get tsObjectDeclarationType() {
-        return this.generatedShaclmateOntology.tsObjectDeclarationType.map((iri) => {
+        return this._generatedOntology.tsObjectDeclarationType.map((iri) => {
             switch (iri.value) {
                 case "http://purl.org/shaclmate/ontology#_TsObjectDeclarationType_Class":
                     return "class";

package/dist/input/PropertyShape.d.ts

@@ -1,13 +1,13 @@
-import { PropertyShape as ShaclCorePropertyShape } from "@shaclmate/shacl-ast";
+import { PropertyShape as ShaclAstPropertyShape } from "@shaclmate/shacl-ast";
 import { Either, Maybe } from "purify-ts";
 import type { PropertyVisibility } from "../enums/PropertyVisibility.js";
 import type * as generated from "./generated.js";
 import type { NodeShape, Ontology, PropertyGroup, ShapesGraph } from "./index.js";
 import type { Shape } from "./Shape.js";
-export declare class PropertyShape extends ShaclCorePropertyShape<NodeShape, Ontology, PropertyGroup, any, Shape> {
-    private readonly generatedShaclmatePropertyShape;
+export declare class PropertyShape extends ShaclAstPropertyShape<NodeShape, Ontology, PropertyGroup, any, Shape> {
+    private readonly _generatedPropertyShape;
     readonly kind = "PropertyShape";
-    constructor(generatedShaclmatePropertyShape: generated.ShaclmatePropertyShape, shapesGraph: ShapesGraph);
+    constructor(_generatedPropertyShape: generated.PropertyShape, shapesGraph: ShapesGraph);
     get comment(): Maybe<string>;
     get description(): Maybe<string>;
     get label(): Maybe<string>;

package/dist/input/PropertyShape.js

@@ -4,15 +4,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { PropertyShape as ShaclCorePropertyShape } from "@shaclmate/shacl-ast";
+import { PropertyShape as ShaclAstPropertyShape } from "@shaclmate/shacl-ast";
 import { Either, List, Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
-export class PropertyShape extends ShaclCorePropertyShape {
-    generatedShaclmatePropertyShape;
+export class PropertyShape extends ShaclAstPropertyShape {
+    _generatedPropertyShape;
     kind = "PropertyShape";
-    constructor(generatedShaclmatePropertyShape, shapesGraph) {
-        super({ ...generatedShaclmatePropertyShape, uniqueLang: Maybe.empty() }, shapesGraph);
-        this.generatedShaclmatePropertyShape = generatedShaclmatePropertyShape;
+    constructor(_generatedPropertyShape, shapesGraph) {
+        super({ ..._generatedPropertyShape, uniqueLang: Maybe.empty() }, shapesGraph);
+        this._generatedPropertyShape = _generatedPropertyShape;
     }
     get comment() {
         return List.head(this.comments);
@@ -24,13 +24,13 @@ export class PropertyShape extends ShaclCorePropertyShape {
         return List.head(this.labels);
     }
     get mutable() {
-        return this.generatedShaclmatePropertyShape.mutable;
+        return this._generatedPropertyShape.mutable;
     }
     get name() {
         return List.head(this.names);
     }
     get resolve() {
-        const identifier = this.generatedShaclmatePropertyShape.resolve.extract();
+        const identifier = this._generatedPropertyShape.resolve.extract();
         return identifier
             ? this.shapesGraph
                 .nodeShapeByIdentifier(identifier)
@@ -38,10 +38,10 @@ export class PropertyShape extends ShaclCorePropertyShape {
             : Either.of(Maybe.empty());
     }
     get shaclmateName() {
-        return this.generatedShaclmatePropertyShape.name;
+        return this._generatedPropertyShape.name;
     }
     get visibility() {
-        return this.generatedShaclmatePropertyShape.visibility
+        return this._generatedPropertyShape.visibility
             .map((iri) => {
             switch (iri.value) {
                 case "http://purl.org/shaclmate/ontology#_Visibility_Private":

package/dist/input/ShapesGraph.d.ts

@@ -1,4 +1,4 @@
-import { ShapesGraph as _ShapesGraph } from "@shaclmate/shacl-ast";
+import { ShapesGraph as _ShapesGraph, type CurieFactory } from "@shaclmate/shacl-ast";
 import type { Either } from "purify-ts";
 import type { Resource } from "rdfjs-resource";
 import { NodeShape, Ontology, PropertyGroup, PropertyShape, type Shape } from "./index.js";
@@ -15,7 +15,8 @@ export declare namespace ShapesGraph {
         protected createPropertyGroup({ resource, }: {
             resource: Resource;
         }): Either<Error, PropertyGroup>;
-        protected createPropertyShape({ resource, shapesGraph, }: {
+        protected createPropertyShape({ curieFactory, resource, shapesGraph, }: {
+            curieFactory: CurieFactory;
             resource: Resource;
             shapesGraph: ShapesGraph;
         }): Either<Error, PropertyShape>;

package/dist/input/ShapesGraph.js

@@ -1,4 +1,4 @@
-import { ShapesGraph as _ShapesGraph } from "@shaclmate/shacl-ast";
+import { ShapesGraph as _ShapesGraph, } from "@shaclmate/shacl-ast";
 import { owl, rdf, rdfs } from "@tpluscode/rdf-ns-builders";
 import { ancestorClassIris } from "./ancestorClassIris.js";
 import { descendantClassIris } from "./descendantClassIris.js";
@@ -8,7 +8,7 @@ export var ShapesGraph;
 (function (ShapesGraph) {
     class Factory extends _ShapesGraph.Factory {
         createNodeShape({ resource, shapesGraph, }) {
-            return generated.ShaclmateNodeShape.$fromRdf(resource, {
+            return generated.NodeShape.$fromRdfResource(resource, {
                 ignoreRdfType: true,
                 preferredLanguages: this.preferredLanguages,
             }).map((generatedShape) => {
@@ -29,7 +29,7 @@ export var ShapesGraph;
                     ancestorClassIris: ancestorClassIris_,
                     childClassIris: descendantClassIris(resource, 1),
                     descendantClassIris: descendantClassIris_,
-                    generatedShaclmateNodeShape: generatedShape,
+                    generatedNodeShape: generatedShape,
                     isClass,
                     isList,
                     parentClassIris: ancestorClassIris(resource, 1),
@@ -38,22 +38,27 @@ export var ShapesGraph;
             });
         }
         createOntology({ resource, }) {
-            return generated.ShaclmateOntology.$fromRdf(resource, {
+            return generated.Ontology.$fromRdfResource(resource, {
                 ignoreRdfType: true,
                 preferredLanguages: this.preferredLanguages,
             }).map((generatedOntology) => new Ontology(generatedOntology));
         }
         createPropertyGroup({ resource, }) {
-            return generated.ShaclCorePropertyGroup.$fromRdf(resource, {
+            return generated.PropertyGroup.$fromRdfResource(resource, {
                 ignoreRdfType: true,
                 preferredLanguages: this.preferredLanguages,
             }).map((generatedPropertyGroup) => new PropertyGroup(generatedPropertyGroup));
         }
-        createPropertyShape({ resource, shapesGraph, }) {
-            return generated.ShaclmatePropertyShape.$fromRdf(resource, {
+        createPropertyShape({ curieFactory, resource, shapesGraph, }) {
+            return generated.PropertyShape.$fromRdfResource(resource, {
                 ignoreRdfType: true,
                 preferredLanguages: this.preferredLanguages,
-            }).map((generatedShape) => new PropertyShape(generatedShape, shapesGraph));
+            }).map((generatedShape) => new PropertyShape({
+                ...generatedShape,
+                path: (generatedShape.path.termType === "NamedNode"
+                    ? curieFactory.create(generatedShape.path).extract()
+                    : undefined) ?? generatedShape.path,
+            }, shapesGraph));
         }
     }
     const factory = new Factory();