bookmarks-rdflib: use executeUpdate from rdflib-utils

solid-contrib · Jul 10, 2024 · 9611e52 · 9611e52
1 parent 6ba0339
commit 9611e52
Show file tree

Hide file tree

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

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmark.ts b/bookmarks/rdflib/src/module/update-operations/createBookmark.ts
@@ -1,10 +1,11 @@
 import { lit, st, sym } from "rdflib";
+import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
 
 export function createBookmark(
   bookmarkUri: string,
   title: string,
   url: string,
-) {
+): UpdateOperation & { uri: string } {
   const bookmarkNode = sym(bookmarkUri);
   return {
     uri: bookmarkUri,

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.ts
@@ -1,12 +1,12 @@
-import { UpdateOperation } from "./index.js";
 import { generateId } from "../../generate-id.js";
 import { createBookmark } from "./createBookmark.js";
+import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
 
 export function createBookmarkWithinContainer(
   containerUri: string,
   title: string,
   url: string,
-): UpdateOperation {
+): UpdateOperation & { uri: string } {
   const id = generateId();
   const bookmarkUri = containerUri + id + "#it";
   return createBookmark(bookmarkUri, title, url);

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.ts
@@ -1,12 +1,12 @@
-import { UpdateOperation } from "./index.js";
 import { generateId } from "../../generate-id.js";
 import { createBookmark } from "./createBookmark.js";
+import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
 
 export function createBookmarkWithinDocument(
   documentUri: string,
   title: string,
   url: string,
-): UpdateOperation {
+): UpdateOperation & { uri: string } {
   const id = generateId();
   const bookmarkUri = documentUri + "#" + id;
   return createBookmark(bookmarkUri, title, url);

diff --git a/bookmarks/rdflib/src/module/update-operations/index.ts b/bookmarks/rdflib/src/module/update-operations/index.ts
@@ -1,15 +1,2 @@
-import { Statement } from "rdflib";
-
 export { createBookmarkWithinContainer } from "./createBookmarkWithinContainer.js";
 export { createBookmarkWithinDocument } from "./createBookmarkWithinDocument.js";
-
-export interface FileToCreate {
-  uri: string;
-}
-
-export interface UpdateOperation {
-  uri: string;
-  insertions: Statement[];
-  deletions: Statement[];
-  filesToCreate: FileToCreate[];
-}
diff --git a/bookmarks/rdflib/src/module/web-operations/executeUpdate.ts b/bookmarks/rdflib/src/module/web-operations/executeUpdate.ts