bookmarks-rdflib: use generateId from rdflib-utils

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

Hide file tree

Showing 10 changed files with 22 additions and 24 deletions.
diff --git a/bookmarks/rdflib/jest.e2e.config.ts b/bookmarks/rdflib/jest.e2e.config.ts
@@ -6,8 +6,8 @@ const config: Config = {
   rootDir: "src/e2e-tests",
   testTimeout: 60000,
   detectOpenHandles: true,
-  globalSetup: "<rootDir>/globalSetup.ts",
-  globalTeardown: "<rootDir>/globalTeardown.ts",
+  globalSetup: "<rootDir>/globalSetup.js",
+  globalTeardown: "<rootDir>/globalTeardown.js",
   forceExit: true,
   extensionsToTreatAsEsm: [".ts"],
   moduleNameMapper: {
@@ -16,13 +16,14 @@ const config: Config = {
   transform: {
     // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
     // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-    "^.+\\.ts$": [
+    "^.+\\.[tj]s$": [
       "ts-jest",
       {
         useESM: true,
       },
     ],
   },
+  transformIgnorePatterns: ["node_modules/(?!(@solid-data-modules)/)"],
 };
 
 export default config;
diff --git a/...marks/rdflib/src/e2e-tests/globalSetup.ts → ...marks/rdflib/src/e2e-tests/globalSetup.js b/...marks/rdflib/src/e2e-tests/globalSetup.ts → ...marks/rdflib/src/e2e-tests/globalSetup.js
@@ -1,8 +1,7 @@
-import { startServer } from "./start-server";
-import { generateId } from "../generate-id";
-import { App } from "@solid/community-server";
+import { startServer } from "./start-server.js";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
-export let server: App;
+export let server;
 
 export default async function () {
   const testId = generateId();

diff --git a/...ks/rdflib/src/e2e-tests/globalTeardown.ts → ...ks/rdflib/src/e2e-tests/globalTeardown.js b/...ks/rdflib/src/e2e-tests/globalTeardown.ts → ...ks/rdflib/src/e2e-tests/globalTeardown.js
@@ -1,4 +1,4 @@
-import { server } from "./globalSetup";
+import { server } from "./globalSetup.js";
 
 export default async function () {
   console.log("stopping test server...");

diff --git a/...arks/rdflib/src/e2e-tests/start-server.ts → ...arks/rdflib/src/e2e-tests/start-server.js b/...arks/rdflib/src/e2e-tests/start-server.ts → ...arks/rdflib/src/e2e-tests/start-server.js
@@ -1,8 +1,13 @@
 import { AppRunner, joinFilePath } from "@solid/community-server";
 
 import { cp } from "fs/promises";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
 
-export async function startServer(id: string) {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export async function startServer(id) {
   const testDataPath = joinFilePath(__dirname, "test-data");
   const rootFilePath = joinFilePath(__dirname, ".test-data", id);
   const app = await new AppRunner().create({

diff --git a/bookmarks/rdflib/src/generate-id.ts b/bookmarks/rdflib/src/generate-id.ts
diff --git a/bookmarks/rdflib/src/module/_integration-tests/create-bookmark.integration.spec.ts b/bookmarks/rdflib/src/module/_integration-tests/create-bookmark.integration.spec.ts
@@ -1,6 +1,5 @@
 import { BookmarksModuleRdfLib } from "../BookmarksModuleRdfLib";
 
-import { generateId } from "../../generate-id";
 import {
   expectPatchRequest,
   mockLdpContainer,
@@ -10,8 +9,9 @@ import {
 import { Fetcher, graph, UpdateManager } from "rdflib";
 
 import { when } from "jest-when";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
-jest.mock("../../generate-id");
+jest.mock("@solid-data-modules/rdflib-utils/identifier");
 
 describe("create bookmark", () => {
   it("creates a new document for the bookmark in the target container", async () => {

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.spec.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.spec.ts
@@ -1,10 +1,10 @@
 import { createBookmarkWithinContainer } from "./createBookmarkWithinContainer";
 
 import { when } from "jest-when";
-import { generateId } from "../../generate-id";
 import { lit, st, sym } from "rdflib";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
-jest.mock("../../generate-id");
+jest.mock("@solid-data-modules/rdflib-utils/identifier");
 
 describe("createBookmarkWithinContainer", () => {
   it("mints a new URI for the bookmark", () => {

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinContainer.ts
@@ -1,6 +1,6 @@
-import { generateId } from "../../generate-id.js";
 import { createBookmark } from "./createBookmark.js";
 import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
 export function createBookmarkWithinContainer(
   containerUri: string,

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.spec.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.spec.ts
@@ -1,10 +1,10 @@
 import { createBookmarkWithinDocument } from "./createBookmarkWithinDocument";
 
 import { when } from "jest-when";
-import { generateId } from "../../generate-id";
 import { lit, st, sym } from "rdflib";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
-jest.mock("../../generate-id");
+jest.mock("@solid-data-modules/rdflib-utils/identifier");
 
 describe("createBookmarkWithinDocument", () => {
   it("mints a new fragment URI for the bookmark within the document", () => {

diff --git a/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.ts b/bookmarks/rdflib/src/module/update-operations/createBookmarkWithinDocument.ts
@@ -1,6 +1,6 @@
-import { generateId } from "../../generate-id.js";
 import { createBookmark } from "./createBookmark.js";
 import { UpdateOperation } from "@solid-data-modules/rdflib-utils";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 
 export function createBookmarkWithinDocument(
   documentUri: string,