bookmarks-rdflib: use namespaces from rdflib-utils

solid-contrib · Jul 10, 2024 · 36d6241 · 36d6241
1 parent ac2efcc
commit 36d6241
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 42 deletions.
diff --git a/bookmarks/rdflib/src/module/BookmarksModuleRdfLib.ts b/bookmarks/rdflib/src/module/BookmarksModuleRdfLib.ts
@@ -4,8 +4,7 @@ import {
   createBookmarkWithinContainer,
   createBookmarkWithinDocument,
 } from "./update-operations/index.js";
-import { ldp, rdf } from "./namespaces.js";
-import { executeUpdate } from "@solid-data-modules/rdflib-utils";
+import { executeUpdate, ldp, rdf } from "@solid-data-modules/rdflib-utils";
 
 interface ModuleConfig {
   store: IndexedFormula;

diff --git a/bookmarks/rdflib/src/module/namespaces.ts b/bookmarks/rdflib/src/module/namespaces.ts
@@ -1,10 +1,5 @@
 import { Namespace } from "rdflib";
 
-export const rdf = Namespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
-
-export const solid = Namespace("http://www.w3.org/ns/solid/terms#");
-export const pim = Namespace("http://www.w3.org/ns/pim/space#");
 export const dct = Namespace("http://purl.org/dc/terms/");
 export const bookm = Namespace("http://www.w3.org/2002/01/bookmark#");
 export const xsd = Namespace("http://www.w3.org/2001/XMLSchema#");
-export const ldp = Namespace("http://www.w3.org/ns/ldp#");
diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmark.ts b/bookmarks/rdflib/src/module/update-operations/createBookmark.ts
@@ -1,5 +1,6 @@
 import { lit, st, sym } from "rdflib";
-import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
+import { rdf, UpdateOperation } from "@solid-data-modules/rdflib-utils";
+import { bookm, dct, xsd } from "../namespaces.js";
 
 export function createBookmark(
   bookmarkUri: string,
@@ -11,32 +12,13 @@ export function createBookmark(
     uri: bookmarkUri,
     deletions: [],
     insertions: [
+      st(bookmarkNode, rdf("type"), bookm("Bookmark"), bookmarkNode.doc()),
+      st(bookmarkNode, dct("title"), lit(title), bookmarkNode.doc()),
+      st(bookmarkNode, bookm("recalls"), sym(url), bookmarkNode.doc()),
       st(
         bookmarkNode,
-        sym("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-        sym("http://www.w3.org/2002/01/bookmark#Bookmark"),
-        bookmarkNode.doc(),
-      ),
-      st(
-        bookmarkNode,
-        sym("http://purl.org/dc/terms/title"),
-        lit(title),
-        bookmarkNode.doc(),
-      ),
-      st(
-        bookmarkNode,
-        sym("http://www.w3.org/2002/01/bookmark#recalls"),
-        sym(url),
-        bookmarkNode.doc(),
-      ),
-      st(
-        bookmarkNode,
-        sym("http://purl.org/dc/terms/created"),
-        lit(
-          new Date().toISOString(),
-          undefined,
-          sym("http://www.w3.org/2001/XMLSchema#dateTime"),
-        ),
+        dct("created"),
+        lit(new Date().toISOString(), undefined, xsd("dateTime")),
         bookmarkNode.doc(),
       ),
     ],

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.spec.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.spec.ts
@@ -3,6 +3,8 @@ import { createBookmarkWithinContainer } from "./createBookmarkWithinContainer";
 import { when } from "jest-when";
 import { lit, st, sym } from "rdflib";
 import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
+import { rdf } from "@solid-data-modules/rdflib-utils";
+import { bookm, dct, xsd } from "../namespaces";
 
 jest.mock("@solid-data-modules/rdflib-utils/identifier");
 
@@ -27,8 +29,8 @@ describe("createBookmarkWithinContainer", () => {
     expect(result.insertions).toContainEqual(
       st(
         sym("https://alice.test/bookmarks/abc123#it"),
-        sym("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-        sym("http://www.w3.org/2002/01/bookmark#Bookmark"),
+        rdf("type"),
+        bookm("Bookmark"),
         sym("https://alice.test/bookmarks/abc123"),
       ),
     );
@@ -44,7 +46,7 @@ describe("createBookmarkWithinContainer", () => {
     expect(result.insertions).toContainEqual(
       st(
         sym("https://alice.test/bookmarks/abc123#it"),
-        sym("http://purl.org/dc/terms/title"),
+        dct("title"),
         lit("My favorite website"),
         sym("https://alice.test/bookmarks/abc123"),
       ),
@@ -61,7 +63,7 @@ describe("createBookmarkWithinContainer", () => {
     expect(result.insertions).toContainEqual(
       st(
         sym("https://alice.test/bookmarks/abc123#it"),
-        sym("http://www.w3.org/2002/01/bookmark#recalls"),
+        bookm("recalls"),
         sym("https://site.test"),
         sym("https://alice.test/bookmarks/abc123"),
       ),
@@ -80,12 +82,8 @@ describe("createBookmarkWithinContainer", () => {
     expect(result.insertions).toContainEqual(
       st(
         sym("https://alice.test/bookmarks/abc123#it"),
-        sym("http://purl.org/dc/terms/created"),
-        lit(
-          "2024-01-02T03:04:05.123Z",
-          undefined,
-          sym("http://www.w3.org/2001/XMLSchema#dateTime"),
-        ),
+        dct("created"),
+        lit("2024-01-02T03:04:05.123Z", undefined, xsd("dateTime")),
         sym("https://alice.test/bookmarks/abc123"),
       ),
     );