@rdfx/builder 0.0.42 → 0.0.44

package/dist/skos.d.ts

@@ -3,18 +3,18 @@ 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"> {
+export interface ConvertibleConceptParameters<ConceptIriString extends string, DefaultNamespaceT extends NamespaceBuilder> extends Omit<Parameters<typeof skos_Concept.createUnsafe<DefaultNamespaceT>>[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>({ toIri, }: BuilderBuilderParameters<NamespaceT>): {
+export declare function skos<DefaultNamespaceT extends NamespaceBuilder>({ defaultNamespace, toIri, }: BuilderBuilderParameters<DefaultNamespaceT>): {
     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;
+    Concept: ($identifier: (keyof DefaultNamespaceT & string) | NamedNode, parameters?: ConvertibleConceptParameters<keyof DefaultNamespaceT & string, DefaultNamespaceT>) => skos_Concept;
+    ConceptScheme: <ConceptsRecordT extends { [K in keyof ConceptsRecordT]: Omit<ConvertibleConceptParameters<Extract<keyof ConceptsRecordT, string>, DefaultNamespaceT>, "broader" | "notation"> & {
+        readonly $identifier?: (keyof DefaultNamespaceT & string) | NamedNode;
         readonly broader?: ConvertibleRelatedConcepts<Extract<keyof ConceptsRecordT, string>> | undefined;
-        readonly notation?: boolean | ConvertibleConceptParameters<Extract<keyof T, string>>["notation"];
-    }; }>($identifier: NamedNode | (keyof NamespaceT & string), parameters?: Omit<Parameters<typeof skos_ConceptScheme.createUnsafe>[0], "$identifier" | "concepts" | "termType" | "topConcepts"> & {
+        readonly notation?: boolean | ConvertibleConceptParameters<Extract<keyof T, string>, DefaultNamespaceT>["notation"];
+    }; }>($identifier: (keyof DefaultNamespaceT & string) | NamedNode, parameters?: Omit<Parameters<typeof skos_ConceptScheme.createUnsafe<DefaultNamespaceT>>[0], "$identifier" | "concepts" | "termType" | "topConcepts"> & {
         readonly concepts?: ConceptsRecordT;
     }) => skos_ConceptScheme;
 };

package/dist/skos.js

@@ -15,7 +15,7 @@ function convertRelatedConcepts(relatedConcepts, toIri) {
         return relatedConcept;
     });
 }
-export function skos({ toIri, }) {
+export function skos({ defaultNamespace, toIri, }) {
     function Concept($identifier, parameters) {
         let { broader: broaderParameter, prefLabel, ...otherParameters } = parameters ?? {};
         if (!prefLabel && typeof $identifier === "string") {
@@ -23,7 +23,8 @@ export function skos({ toIri, }) {
         }
         return skos_Concept.createUnsafe({
             ...otherParameters,
-            $identifier: toIri($identifier),
+            $defaultNamespace: defaultNamespace,
+            $identifier,
             broader: convertRelatedConcepts(broaderParameter, (key) => toIri(key)),
             prefLabel,
         });
@@ -55,6 +56,7 @@ export function skos({ toIri, }) {
             }
             return skos_ConceptScheme.createUnsafe({
                 ...otherParameters,
+                $defaultNamespace: defaultNamespace,
                 $identifier: conceptSchemeIdentifier,
                 concepts,
                 prefLabel,

package/package.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "@rdfx/data-factory": "0.0.42",
-    "@rdfx/literal": "0.0.42",
-    "@rdfx/resource": "0.0.42",
-    "@rdfx/string": "0.0.42",
+    "@rdfx/data-factory": "0.0.44",
+    "@rdfx/literal": "0.0.44",
+    "@rdfx/resource": "0.0.44",
+    "@rdfx/string": "0.0.44",
     "@rdfjs/namespace": "~2.0.1",
     "@rdfjs/types": "~2.0.1",
     "@types/rdfjs__namespace": "~2.0.10",
@@ -11,11 +11,11 @@
     "purify-ts": "~2.1.4"
   },
   "devDependencies": {
-    "@rdfx/collection": "0.0.42",
-    "@rdfx/fs": "0.0.42",
-    "@rdfx/testing": "0.0.42",
-    "@shaclmate/compiler": "4.0.65",
-    "@shaclmate/validator": "4.0.65",
+    "@rdfx/collection": "0.0.44",
+    "@rdfx/fs": "0.0.44",
+    "@rdfx/testing": "0.0.44",
+    "@shaclmate/compiler": "4.0.80",
+    "@shaclmate/validator": "4.0.80",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "ts-log": "~3.0.2"
   },
@@ -38,9 +38,9 @@
     "depcheck": "depcheck --ignores=\"@tsconfig/*,vitest,vitest-fetch-mock\" .",
     "dev": "tsc -w --preserveWatchOutput",
     "dev:tests": "tsc -p __tests__ -w --preserveWatchOutput",
-    "test": "cd ../.. && vitest run /Users/minor/projects/rdfx/packages/builder/__tests__"
+    "test": "cd ../.. && vitest run packages/builder/__tests__"
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "0.0.42"
+  "version": "0.0.44"
 }