@shaclmate/compiler 4.0.53 → 4.0.55

package/dist/ShapesGraphToAstTransformer.d.ts

@@ -6,7 +6,7 @@ import type * as ast from "./ast/index.js";
 import type * as input from "./input/index.js";
 export declare class ShapesGraphToAstTransformer {
     protected readonly cachedAstTypesByShapeIdentifier: TermMap<BlankNode | NamedNode, ast.Type>;
-    protected readonly syntheticAstStructTypesByName: Map<string, ast.StructType>;
+    protected readonly syntheticAstStructTypes: ast.StructType[];
     protected readonly logger: Logger;
     protected readonly shapesGraph: input.ShapesGraph;
     constructor({ logger, shapesGraph, }: {

package/dist/ShapesGraphToAstTransformer.js

@@ -5,7 +5,7 @@ import { transformShapeToAstType } from "./_ShapesGraphToAstTransformer/transfor
 export class ShapesGraphToAstTransformer {
     // Members are protected so they're accessible to functions in other files
     cachedAstTypesByShapeIdentifier = new TermMap();
-    syntheticAstStructTypesByName = new Map();
+    syntheticAstStructTypes = [];
     logger;
     shapesGraph;
     constructor({ logger, shapesGraph, }) {
@@ -41,9 +41,7 @@ export class ShapesGraphToAstTransformer {
                         return acc;
                 }
             }, 0),
-            namedTypes: astNamedTypes.concat([
-                ...this.syntheticAstStructTypesByName.values(),
-            ]),
+            namedTypes: astNamedTypes.concat(this.syntheticAstStructTypes),
         });
     }
 }

package/dist/_ShapesGraphToAstTransformer/shapeNodeKinds.js

@@ -1,5 +1,5 @@
 import { NodeKind } from "@shaclmate/shacl-ast";
-import { Either, Left } from "purify-ts";
+import { Either, Left, Maybe } from "purify-ts";
 import { defaultNodeShapeNodeKinds } from "./defaultNodeShapeNodeKinds.js";
 const defaultPropertyShapeNodeKinds = new Set([
     "BlankNode",
@@ -90,6 +90,28 @@ export function shapeNodeKinds(shape, options) {
                     .orDefault([]),
             },
         ],
+        [
+            "sh:node",
+            {
+                includeNodeKinds: shape.node
+                    .chain((node) => this.shapesGraph.nodeShape(node).toMaybe())
+                    .chain((nodeShape) => shapeNodeKinds.call(this, nodeShape).toMaybe())
+                    .map((nodeKinds) => [...nodeKinds])
+                    .orDefault([]),
+            },
+        ],
+        [
+            "shaclmate:resolve",
+            {
+                includeNodeKinds: (shape.$type === "PropertyShape"
+                    ? shape.resolve
+                    : Maybe.empty())
+                    .chain((resolve) => this.shapesGraph.nodeShape(resolve).toMaybe())
+                    .chain((nodeShape) => shapeNodeKinds.call(this, nodeShape).toMaybe())
+                    .map((nodeKinds) => [...nodeKinds])
+                    .orDefault([]),
+            },
+        ],
     ]) {
         for (const excludeNodeKind of excludeNodeKinds ?? []) {
             if (explicitNodeKinds.size > 0 &&

package/dist/_ShapesGraphToAstTransformer/transformPropertyShapeToAstStructTypeField.js

@@ -60,7 +60,8 @@ function synthesizePartialAstStructType({ identifierType, }) {
             syntheticName = "NamedDefaultPartial";
             break;
     }
-    let partialAstStructType = this.syntheticAstStructTypesByName.get(syntheticName);
+    let partialAstStructType = this.syntheticAstStructTypes.find((syntheticAstStructType) => syntheticAstStructType.name.extract() === syntheticName &&
+        ast.Type.equals(syntheticAstStructType.identifierType, identifierType));
     if (partialAstStructType) {
         return partialAstStructType;
     }
@@ -76,7 +77,7 @@ function synthesizePartialAstStructType({ identifierType, }) {
         toRdfTypes: [],
         tsImports: [],
     });
-    this.syntheticAstStructTypesByName.set(syntheticName, partialAstStructType);
+    this.syntheticAstStructTypes.push(partialAstStructType);
     return partialAstStructType;
 }
 function transformPropertyShapeToAstType(propertyShape, shapeStack) {

package/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.53",
+    "@shaclmate/shacl-ast": "4.0.55",
     "@rdfjs/dataset": "~2.0.2",
     "@rdfjs/prefix-map": "~0.1.2",
     "@rdfjs/term-map": "~2.0.2",
     "@rdfjs/term-set": "~2.0.3",
     "@rdfjs/types": "~2.0.1",
-    "@rdfx/data-factory": "0.0.24",
-    "@rdfx/literal": "0.0.24",
-    "@rdfx/resource": "0.0.24",
-    "@rdfx/string": "0.0.24",
+    "@rdfx/data-factory": "0.0.25",
+    "@rdfx/literal": "0.0.25",
+    "@rdfx/resource": "0.0.25",
+    "@rdfx/string": "0.0.25",
     "@sindresorhus/base62": "~0.1.0",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "@types/rdfjs__dataset": "~2.0.7",
@@ -660,5 +660,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.53"
+  "version": "4.0.55"
 }