@rdfx/builder 0.0.42 → 0.0.44

package/dist/sh.js

@@ -31,10 +31,10 @@ function convertNodeKind(nodeKind) {
     }
     return _namespace[nodeKind];
 }
-export function sh({ namespace, toIdentifier, toIri, toIriArray, }) {
+export function sh({ defaultNamespace, toIdentifier, toIri, toIriArray, }) {
     function PropertyShape($identifier, parameters) {
         // Order of default population matters here.
-        const { cardinality: cardinalityParameter, class: classParameter, in_: inParameter, path: pathParameter, node: nodeParameter, nodeKind: nodeKindParameter, resolve: resolveParameter, xone: xoneParameter, ...otherParameters } = parameters ?? {};
+        const { cardinality: cardinalityParameter, in_: inParameter, path: pathParameter, nodeKind: nodeKindParameter, ...otherParameters } = parameters ?? {};
         const $identifierTerm = toIdentifier($identifier);
         let path;
         switch (typeof pathParameter) {
@@ -70,27 +70,22 @@ export function sh({ namespace, toIdentifier, toIri, toIriArray, }) {
         }
         return sh_PropertyShape.createUnsafe({
             ...otherParameters,
+            $defaultNamespace: defaultNamespace,
             $identifier: $identifierTerm,
-            class_: classParameter ? toIriArray(classParameter) : undefined,
             in_: convertIn(inParameter),
             maxCount,
             minCount,
-            node: nodeParameter ? toIri(nodeParameter) : undefined,
             nodeKind: nodeKindParameter
                 ? convertNodeKind(nodeKindParameter)
                 : undefined,
             path,
-            resolve: resolveParameter ? toIri(resolveParameter) : undefined,
-            xone: xoneParameter
-                ? xoneParameter.map((xoneMember) => typeof xoneMember === "string" ? toIri(xoneMember) : xoneMember)
-                : undefined,
         });
     }
     return {
         namespace: _namespace,
         NodeShape: ($identifier, parameters) => {
             const nodeShapeIdentifier = toIdentifier($identifier);
-            let { implicitClassTarget, in_: inParameter, nodeKind: nodeKindParameter, properties: propertiesParameter, shaclmateName, type: typeParameter, xone: xoneParameter, ...otherParameters } = parameters ?? {};
+            let { implicitClassTarget, in_: inParameter, nodeKind: nodeKindParameter, properties: propertiesParameter, shaclmateName, type: typeParameter, ...otherParameters } = parameters ?? {};
             let properties;
             if (propertiesParameter) {
                 if (Array.isArray(propertiesParameter)) {
@@ -121,7 +116,7 @@ export function sh({ namespace, toIdentifier, toIri, toIriArray, }) {
                             name = key;
                         }
                         if (!path) {
-                            path = namespace(key);
+                            path = defaultNamespace(key);
                         }
                         return PropertyShape(identifierTerm, {
                             ...otherPropertyParameters,
@@ -148,15 +143,13 @@ export function sh({ namespace, toIdentifier, toIri, toIriArray, }) {
             }
             return sh_NodeShape.createUnsafe({
                 ...otherParameters,
+                $defaultNamespace: defaultNamespace,
                 $identifier: nodeShapeIdentifier,
                 in_: convertIn(inParameter),
                 nodeKind: convertNodeKind(nodeKindParameter),
                 properties,
                 shaclmateName,
                 type,
-                xone: xoneParameter
-                    ? xoneParameter.map((xoneMember) => typeof xoneMember === "string" ? toIri(xoneMember) : xoneMember)
-                    : undefined,
             });
         },
         PropertyShape,