@rdfx/builder 0.0.31 → 0.0.33

package/dist/shapes.js

@@ -326,7 +326,7 @@ export var sh_NodeShape;
     sh_NodeShape.create = (parameters) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters?.$identifier),
         and: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters?.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(sh_NodeShape.schema.properties.and.type, value)),
-        classes: $convertToScalarSet(($convertToIri), true)(parameters?.classes).chain((value) => $validateArray($identityValidationFunction, true)(sh_NodeShape.schema.properties.classes.type, value)),
+        class_: $convertToScalarSet(($convertToIri), true)(parameters?.class_).chain((value) => $validateArray($identityValidationFunction, true)(sh_NodeShape.schema.properties.class_.type, value)),
         closed: $convertToMaybe($identityConversionFunction)(parameters?.closed).chain((value) => $validateMaybe($identityValidationFunction)(sh_NodeShape.schema.properties.closed.type, value)),
         comment: $convertToMaybe($identityConversionFunction)(parameters?.comment).chain((value) => $validateMaybe($identityValidationFunction)(owl_Ontology.schema.properties.comment.type, value)),
         datatype: $convertToMaybe(($convertToIri))(parameters?.datatype).chain((value) => $validateMaybe($identityValidationFunction)(sh_NodeShape.schema.properties.datatype.type, value)),
@@ -424,7 +424,7 @@ export var sh_NodeShape;
                     };
                 },
             },
-            classes: {
+            class_: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },
@@ -920,7 +920,7 @@ export var sh_NodeShape;
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), parameters.graph);
-        parameters.resource.add(sh_NodeShape.schema.properties.classes.path, parameters.object.classes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(sh_NodeShape.schema.properties.class_.path, parameters.object.class_.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(sh_NodeShape.schema.properties.closed.path, parameters.object.closed
             .toList()
             .flatMap((value) => [
@@ -1306,7 +1306,7 @@ export var sh_PropertyShape;
     sh_PropertyShape.create = (parameters) => $sequenceRecord({
         $identifier: $convertToIdentifierProperty(parameters.$identifier),
         and: $convertToMaybe($convertToList($identityConversionFunction, true))(parameters.and).chain((value) => $validateMaybe($validateArray($identityValidationFunction, true))(sh_NodeShape.schema.properties.and.type, value)),
-        classes: $convertToScalarSet(($convertToIri), true)(parameters.classes).chain((value) => $validateArray($identityValidationFunction, true)(sh_NodeShape.schema.properties.classes.type, value)),
+        class_: $convertToScalarSet(($convertToIri), true)(parameters.class_).chain((value) => $validateArray($identityValidationFunction, true)(sh_NodeShape.schema.properties.class_.type, value)),
         comment: $convertToMaybe($identityConversionFunction)(parameters.comment).chain((value) => $validateMaybe($identityValidationFunction)(owl_Ontology.schema.properties.comment.type, value)),
         datatype: $convertToMaybe(($convertToIri))(parameters.datatype).chain((value) => $validateMaybe($identityValidationFunction)(sh_NodeShape.schema.properties.datatype.type, value)),
         deactivated: $convertToMaybe($identityConversionFunction)(parameters.deactivated).chain((value) => $validateMaybe($identityValidationFunction)(sh_NodeShape.schema.properties.deactivated.type, value)),
@@ -1412,7 +1412,7 @@ export var sh_PropertyShape;
                     };
                 },
             },
-            classes: {
+            class_: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },
@@ -1974,7 +1974,7 @@ export var sh_PropertyShape;
                 }).listResource.identifier
                 : $RdfVocabularies.rdf.nil,
         ]), parameters.graph);
-        parameters.resource.add(sh_NodeShape.schema.properties.classes.path, parameters.object.classes.flatMap((item) => [item]), parameters.graph);
+        parameters.resource.add(sh_NodeShape.schema.properties.class_.path, parameters.object.class_.flatMap((item) => [item]), parameters.graph);
         parameters.resource.add(owl_Ontology.schema.properties.comment.path, parameters.object.comment
             .toList()
             .flatMap((value) => [$literalFactory.string(value)]), parameters.graph);
@@ -2897,7 +2897,7 @@ export var sh_Shape;
                     };
                 },
             },
-            classes: {
+            class_: {
                 kind: "Shacl",
                 path: dataFactory.namedNode("http://www.w3.org/ns/shacl#class"),
                 type: { kind: "Set", itemType: { kind: "Iri" } },

package/dist/skos.d.ts

@@ -1,13 +1,14 @@
 import type { NamespaceBuilder } from "@rdfjs/namespace";
 import type { NamedNode } from "@rdfjs/types";
+import { skos as _namespace } from "@tpluscode/rdf-ns-builders";
+import type { BuilderBuilderParameters } from "./BuilderBuilderParameters.js";
 import { skos_Concept, skos_ConceptScheme } from "./shapes.js";
 export interface ConvertibleConceptParameters<ConceptIriString extends string> extends Omit<Parameters<typeof skos_Concept.createUnsafe>[0], "$identifier" | "broader" | "termType"> {
     readonly broader?: ConvertibleRelatedConcepts<ConceptIriString>;
 }
 type ConvertibleRelatedConcepts<ConceptIriString> = ConceptIriString | NamedNode | skos_Concept | readonly (ConceptIriString | NamedNode | skos_Concept)[];
-export declare function skos<NamespaceT extends NamespaceBuilder>({ namespace, }: {
-    namespace: NamespaceT;
-}): {
+export declare function skos<NamespaceT extends NamespaceBuilder>({ toIri, }: BuilderBuilderParameters<NamespaceT>): {
+    namespace: NamespaceBuilder<keyof typeof _namespace>;
     Concept: ($identifier: NamedNode | (keyof NamespaceT & string), parameters?: ConvertibleConceptParameters<keyof NamespaceT & string>) => skos_Concept;
     ConceptScheme: <ConceptsRecordT extends { [K in keyof ConceptsRecordT]: Omit<ConvertibleConceptParameters<Extract<keyof ConceptsRecordT, string>>, "broader" | "notation"> & {
         readonly $identifier?: (keyof NamespaceT & string) | NamedNode;

package/dist/skos.js

@@ -1,6 +1,7 @@
 import dataFactory from "@rdfx/data-factory";
+import { skos as _namespace } from "@tpluscode/rdf-ns-builders";
+import { sentenceCase } from "change-case";
 import { skos_Concept, skos_ConceptScheme } from "./shapes.js";
-import { toIri } from "./toIri.js";
 function convertRelatedConcepts(relatedConcepts, toIri) {
     if (!relatedConcepts) {
         return [];
@@ -14,25 +15,30 @@ function convertRelatedConcepts(relatedConcepts, toIri) {
         return relatedConcept;
     });
 }
-export function skos({ namespace, }) {
-    function ConceptBuilder($identifier, parameters) {
-        const { broader: broaderParameter, ...otherParameters } = parameters ?? {};
+export function skos({ toIri, }) {
+    function Concept($identifier, parameters) {
+        let { broader: broaderParameter, prefLabel, ...otherParameters } = parameters ?? {};
+        if (!prefLabel && typeof $identifier === "string") {
+            prefLabel = sentenceCase($identifier);
+        }
         return skos_Concept.createUnsafe({
             ...otherParameters,
-            $identifier: toIri($identifier, namespace),
-            broader: convertRelatedConcepts(broaderParameter, (key) => toIri(key, namespace)),
+            $identifier: toIri($identifier),
+            broader: convertRelatedConcepts(broaderParameter, (key) => toIri(key)),
+            prefLabel,
         });
     }
     return {
-        Concept: ConceptBuilder,
+        namespace: _namespace,
+        Concept: Concept,
         ConceptScheme: ($identifier, parameters) => {
-            const { concepts: conceptsRecord, ...otherParameters } = parameters ?? {};
-            const conceptSchemeIdentifier = toIri($identifier, namespace);
+            let { concepts: conceptsRecord, prefLabel, ...otherParameters } = parameters ?? {};
+            const conceptSchemeIdentifier = toIri($identifier);
             const conceptsRecordKeyToIri = (conceptsRecordKey) => dataFactory.namedNode(`${conceptSchemeIdentifier.value}_${conceptsRecordKey}`);
             const concepts = [];
             for (const [conceptsRecordKey, conceptsRecordValue] of Object.entries(conceptsRecord ?? {})) {
-                concepts.push(ConceptBuilder(conceptsRecordValue.$identifier
-                    ? toIri(conceptsRecordValue.$identifier, namespace)
+                concepts.push(Concept(conceptsRecordValue.$identifier
+                    ? toIri(conceptsRecordValue.$identifier)
                     : conceptsRecordKeyToIri(conceptsRecordKey), {
                     ...conceptsRecordValue,
                     broader: convertRelatedConcepts(conceptsRecordValue.broader, conceptsRecordKeyToIri),
@@ -40,12 +46,18 @@ export function skos({ namespace, }) {
                         conceptsRecordValue.notation
                         ? [dataFactory.literal(conceptsRecordKey)]
                         : conceptsRecordValue.notation,
+                    prefLabel: conceptsRecordValue.prefLabel ??
+                        sentenceCase(conceptsRecordKey),
                 }));
             }
+            if (!prefLabel && typeof $identifier === "string") {
+                prefLabel = sentenceCase($identifier);
+            }
             return skos_ConceptScheme.createUnsafe({
                 ...otherParameters,
                 $identifier: conceptSchemeIdentifier,
                 concepts,
+                prefLabel,
                 topConcepts: concepts
                     .filter((concept) => concept.broader.length === 0)
                     .map((concept) => concept.$identifier()),

package/package.json

@@ -1,16 +1,17 @@
 {
   "dependencies": {
-    "@rdfx/data-factory": "0.0.31",
-    "@rdfx/resource": "0.0.31",
+    "@rdfx/data-factory": "0.0.33",
+    "@rdfx/resource": "0.0.33",
     "@rdfjs/namespace": "~2.0.1",
     "@rdfjs/types": "~2.0.1",
     "@types/rdfjs__namespace": "~2.0.10",
+    "change-case": "~5.4.4",
     "purify-ts": "~2.1.4",
     "ts-invariant": "~0.10.3"
   },
   "devDependencies": {
-    "@rdfx/fs": "0.0.31",
-    "@rdfx/resource": "0.0.31",
+    "@rdfx/fs": "0.0.33",
+    "@rdfx/resource": "0.0.33",
     "@rdfjs/dataset": "~2.0.2",
     "@shaclmate/compiler": "4.0.65",
     "@shaclmate/validator": "4.0.65",
@@ -41,5 +42,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "0.0.31"
+  "version": "0.0.33"
 }

package/dist/toIri.d.ts

@@ -1,4 +0,0 @@
-import type { NamespaceBuilder } from "@rdfjs/namespace";
-import type { NamedNode } from "@rdfjs/types";
-export declare function toIri<NamespaceT extends NamespaceBuilder>(iri: (keyof NamespaceT & string) | NamedNode, namespace: NamespaceT): NamedNode;
-//# sourceMappingURL=toIri.d.ts.map

package/dist/toIri.js

@@ -1,11 +0,0 @@
-export function toIri(iri, namespace) {
-    switch (typeof iri) {
-        case "object":
-            return iri;
-        case "string":
-            return namespace(iri);
-        default:
-            throw new RangeError(typeof iri);
-    }
-}
-//# sourceMappingURL=toIri.js.map