@unchainedshop/core-bookmarks 3.0.0-alpha2 → 3.0.0-alpha4

package/lib/bookmarks-index.d.ts

@@ -1,3 +1,3 @@
-export { configureBookmarksModule } from './module/configureBookmarksModule.js';
-export { bookmarkServices } from './service/bookmarkServices.js';
+export * from './module/configureBookmarksModule.js';
+export * from './service/bookmarkServices.js';
 //# sourceMappingURL=bookmarks-index.d.ts.map

package/lib/bookmarks-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bookmarks-index.d.ts","sourceRoot":"","sources":["../src/bookmarks-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"bookmarks-index.d.ts","sourceRoot":"","sources":["../src/bookmarks-index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC"}

package/lib/bookmarks-index.js

@@ -1,3 +1,3 @@
-export { configureBookmarksModule } from './module/configureBookmarksModule.js';
-export { bookmarkServices } from './service/bookmarkServices.js';
+export * from './module/configureBookmarksModule.js';
+export * from './service/bookmarkServices.js';
 //# sourceMappingURL=bookmarks-index.js.map

package/lib/bookmarks-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"bookmarks-index.js","sourceRoot":"","sources":["../src/bookmarks-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"bookmarks-index.js","sourceRoot":"","sources":["../src/bookmarks-index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC"}

package/lib/db/BookmarksCollection.d.ts

@@ -1,4 +1,4 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { Bookmark } from '@unchainedshop/types/bookmarks.js';
+import type { Bookmark } from '../bookmarks-index.js';
 export declare const BookmarksCollection: (db: mongodb.Db) => Promise<mongodb.Collection<Bookmark>>;
 //# sourceMappingURL=BookmarksCollection.d.ts.map

package/lib/db/BookmarksCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BookmarksCollection.d.ts","sourceRoot":"","sources":["../../src/db/BookmarksCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,0CAOvD,CAAC"}
+{"version":3,"file":"BookmarksCollection.d.ts","sourceRoot":"","sources":["../../src/db/BookmarksCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,0CAOvD,CAAC"}

package/lib/module/configureBookmarksModule.d.ts

@@ -1,4 +1,22 @@
-import { BookmarksModule } from '@unchainedshop/types/bookmarks.js';
-import { ModuleInput } from '@unchainedshop/types/core.js';
+import { mongodb } from '@unchainedshop/mongodb';
+import type { TimestampFields, ModuleInput } from '@unchainedshop/mongodb';
+export type Bookmark = {
+    _id?: string;
+    userId: string;
+    productId: string;
+    meta?: any;
+} & TimestampFields;
+export interface BookmarksModule {
+    create: (doc: Bookmark) => Promise<string | null>;
+    update: (_id: string, doc: mongodb.UpdateFilter<Bookmark> | Bookmark) => Promise<string>;
+    delete: (_id: string) => Promise<number>;
+    findBookmarksByUserId: (userId: string) => Promise<Array<Bookmark>>;
+    findBookmarkById: (bookmarkId: string) => Promise<Bookmark>;
+    findBookmarks: (query: mongodb.Filter<Bookmark>) => Promise<Array<Bookmark>>;
+    replaceUserId: (fromUserId: string, toUserId: string, bookmarkIds?: Array<string>) => Promise<number>;
+    deleteByUserId: (toUserId: string) => Promise<number>;
+    deleteByProductId: (productId: string) => Promise<number>;
+    deleteByUserIdAndMeta: (meta: any) => Promise<number>;
+}
 export declare const configureBookmarksModule: ({ db, }: ModuleInput<Record<string, never>>) => Promise<BookmarksModule>;
 //# sourceMappingURL=configureBookmarksModule.d.ts.map

package/lib/module/configureBookmarksModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureBookmarksModule.d.ts","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAO5E,eAAO,MAAM,wBAAwB,YAElC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CAmE9D,CAAC"}
+{"version":3,"file":"configureBookmarksModule.d.ts","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI3E,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,GAAG,eAAe,CAAC;AAMpB,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAClD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,QAAQ,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzF,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7E,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtG,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,qBAAqB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,wBAAwB,YAElC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CA0E9D,CAAC"}

package/lib/module/configureBookmarksModule.js

@@ -1,17 +1,12 @@
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations } from '@unchainedshop/mongodb';
+import { generateDbFilterById, generateDbObjectId } from '@unchainedshop/mongodb';
 import { BookmarksCollection } from '../db/BookmarksCollection.js';
-import { BookmarkSchema } from '../db/BookmarksSchema.js';
 const BOOKMARK_EVENTS = ['BOOKMARK_CREATE', 'BOOKMARK_UPDATE', 'BOOKMARK_REMOVE'];
 export const configureBookmarksModule = async ({ db, }) => {
     registerEvents(BOOKMARK_EVENTS);
     const Bookmarks = await BookmarksCollection(db);
-    const mutations = generateDbMutations(Bookmarks, BookmarkSchema, {
-        permanentlyDeleteByDefault: true,
-    });
     return {
         // Queries
-        ...mutations,
         findBookmarksByUserId: async (userId) => Bookmarks.find({ userId }).toArray(),
         findBookmarkById: async (bookmarkId) => {
             const filter = generateDbFilterById(bookmarkId);
@@ -51,17 +46,26 @@ export const configureBookmarksModule = async ({ db, }) => {
             return result.deletedCount;
         },
         create: async (doc) => {
-            const bookmarkId = await mutations.create(doc);
+            const { insertedId: bookmarkId } = await Bookmarks.insertOne({
+                _id: generateDbObjectId(),
+                created: new Date(),
+                ...doc,
+            });
             await emit('BOOKMARK_CREATE', { bookmarkId });
             return bookmarkId;
         },
-        update: async (_id, doc) => {
-            const bookmarkId = await mutations.update(_id, doc);
+        update: async (bookmarkId, doc) => {
+            await Bookmarks.updateOne({ _id: bookmarkId }, {
+                $set: {
+                    updated: new Date(),
+                    ...doc,
+                },
+            });
             await emit('BOOKMARK_UPDATE', { bookmarkId });
             return bookmarkId;
         },
         delete: async (bookmarkId) => {
-            const deletedCount = await mutations.delete(bookmarkId);
+            const { deletedCount } = await Bookmarks.deleteOne({ _id: bookmarkId });
             await emit('BOOKMARK_REMOVE', { bookmarkId });
             return deletedCount;
         },

package/lib/module/configureBookmarksModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureBookmarksModule.js","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureBookmarksModule.js","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"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"}

package/lib/service/bookmarkServices.d.ts

@@ -1,3 +1,7 @@
-import { BookmarkServices } from '@unchainedshop/types/bookmarks.js';
+import { MigrateBookmarksService } from './migrateBookmarksService.js';
+export interface BookmarkServices {
+    migrateBookmarks: MigrateBookmarksService;
+}
 export declare const bookmarkServices: BookmarkServices;
+export type { MigrateBookmarksService };
 //# sourceMappingURL=bookmarkServices.d.ts.map

package/lib/service/bookmarkServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bookmarkServices.d.ts","sourceRoot":"","sources":["../../src/service/bookmarkServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,eAAO,MAAM,gBAAgB,EAAE,gBAE9B,CAAC"}
+{"version":3,"file":"bookmarkServices.d.ts","sourceRoot":"","sources":["../../src/service/bookmarkServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAA2B,MAAM,8BAA8B,CAAC;AAEhG,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,uBAAuB,CAAC;CAC3C;AAED,eAAO,MAAM,gBAAgB,EAAE,gBAE9B,CAAC;AAEF,YAAY,EAAE,uBAAuB,EAAE,CAAC"}

package/lib/service/bookmarkServices.js.map

@@ -1 +1 @@
-{"version":3,"file":"bookmarkServices.js","sourceRoot":"","sources":["../../src/service/bookmarkServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAChD,gBAAgB,EAAE,uBAAuB;CAC1C,CAAC"}
+{"version":3,"file":"bookmarkServices.js","sourceRoot":"","sources":["../../src/service/bookmarkServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAMhG,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAChD,gBAAgB,EAAE,uBAAuB;CAC1C,CAAC"}

package/lib/service/migrateBookmarksService.d.ts

@@ -1,3 +1,13 @@
-import { MigrateBookmarksService } from '@unchainedshop/types/bookmarks.js';
+import { BookmarksModule } from '../bookmarks-index.js';
+export type MigrateBookmarksService = (params: {
+    fromUserId: string;
+    toUserId: string;
+    shouldMerge: boolean;
+    countryContext: string;
+}, unchainedAPI: {
+    modules: {
+        bookmarks: BookmarksModule;
+    };
+}) => Promise<void>;
 export declare const migrateBookmarksService: MigrateBookmarksService;
 //# sourceMappingURL=migrateBookmarksService.d.ts.map

package/lib/service/migrateBookmarksService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateBookmarksService.d.ts","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAM5E,eAAO,MAAM,uBAAuB,EAAE,uBAuBrC,CAAC"}
+{"version":3,"file":"migrateBookmarksService.d.ts","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAAG,CACpC,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB,EACD,YAAY,EAAE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE,CAAA;CAAE,KACtD,OAAO,CAAC,IAAI,CAAC,CAAC;AAMnB,eAAO,MAAM,uBAAuB,EAAE,uBAuBrC,CAAC"}

package/lib/service/migrateBookmarksService.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrateBookmarksService.js","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,EAAE;IAChC,OAAO,GAAG,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAA4B,KAAK,EACnE,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,EACrC,EAAE,OAAO,EAAE,EACX,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACpF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,8BAA8B;QAC9B,OAAO;IACT,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChF,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,aAAa;aACjC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;YACxC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"migrateBookmarksService.js","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAYA,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,EAAE;IAChC,OAAO,GAAG,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAA4B,KAAK,EACnE,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,EACrC,EAAE,OAAO,EAAE,EACX,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACpF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,8BAA8B;QAC9B,OAAO;IACT,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChF,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,aAAa;aACjC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;YACxC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-bookmarks",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha4",
   "main": "lib/bookmarks-index.js",
   "exports": {
     ".": "./lib/bookmarks-index.js",
@@ -31,15 +31,13 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha2",
-    "@unchainedshop/utils": "^3.0.0-alpha2",
-    "simpl-schema": "^3.4.6"
+    "@unchainedshop/events": "^3.0.0-alpha4",
+    "@unchainedshop/utils": "^3.0.0-alpha4"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@unchainedshop/types": "^3.0.0-alpha2",
+    "@types/node": "^22.7.8",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   }
 }

package/src/bookmarks-index.ts

@@ -1,2 +1,2 @@
-export { configureBookmarksModule } from './module/configureBookmarksModule.js';
-export { bookmarkServices } from './service/bookmarkServices.js';
+export * from './module/configureBookmarksModule.js';
+export * from './service/bookmarkServices.js';

package/src/db/BookmarksCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { Bookmark } from '@unchainedshop/types/bookmarks.js';
+import type { Bookmark } from '../bookmarks-index.js';
 
 export const BookmarksCollection = async (db: mongodb.Db) => {
   const Bookmarks = db.collection<Bookmark>('bookmarks');

package/src/module/configureBookmarksModule.ts

@@ -1,12 +1,34 @@
 import { emit, registerEvents } from '@unchainedshop/events';
-import { Bookmark, BookmarksModule } from '@unchainedshop/types/bookmarks.js';
-import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core.js';
-import { generateDbFilterById, generateDbMutations, mongodb } from '@unchainedshop/mongodb';
+import { generateDbFilterById, generateDbObjectId, mongodb } from '@unchainedshop/mongodb';
 import { BookmarksCollection } from '../db/BookmarksCollection.js';
-import { BookmarkSchema } from '../db/BookmarksSchema.js';
+import type { TimestampFields, ModuleInput } from '@unchainedshop/mongodb';
 
 const BOOKMARK_EVENTS: string[] = ['BOOKMARK_CREATE', 'BOOKMARK_UPDATE', 'BOOKMARK_REMOVE'];
 
+export type Bookmark = {
+  _id?: string;
+  userId: string;
+  productId: string;
+  meta?: any;
+} & TimestampFields;
+
+/*
+ * Module
+ */
+
+export interface BookmarksModule {
+  create: (doc: Bookmark) => Promise<string | null>;
+  update: (_id: string, doc: mongodb.UpdateFilter<Bookmark> | Bookmark) => Promise<string>;
+  delete: (_id: string) => Promise<number>;
+  findBookmarksByUserId: (userId: string) => Promise<Array<Bookmark>>;
+  findBookmarkById: (bookmarkId: string) => Promise<Bookmark>;
+  findBookmarks: (query: mongodb.Filter<Bookmark>) => Promise<Array<Bookmark>>;
+  replaceUserId: (fromUserId: string, toUserId: string, bookmarkIds?: Array<string>) => Promise<number>;
+  deleteByUserId: (toUserId: string) => Promise<number>;
+  deleteByProductId: (productId: string) => Promise<number>;
+  deleteByUserIdAndMeta: (meta: any) => Promise<number>;
+}
+
 export const configureBookmarksModule = async ({
   db,
 }: ModuleInput<Record<string, never>>): Promise<BookmarksModule> => {
@@ -14,13 +36,8 @@ export const configureBookmarksModule = async ({
 
   const Bookmarks = await BookmarksCollection(db);
 
-  const mutations = generateDbMutations<Bookmark>(Bookmarks, BookmarkSchema, {
-    permanentlyDeleteByDefault: true,
-  }) as ModuleMutations<Bookmark>;
-
   return {
     // Queries
-    ...mutations,
     findBookmarksByUserId: async (userId) => Bookmarks.find({ userId }).toArray(),
     findBookmarkById: async (bookmarkId) => {
       const filter = generateDbFilterById(bookmarkId);
@@ -60,18 +77,30 @@ export const configureBookmarksModule = async ({
       await Promise.all(bookmarks.map(async (b) => emit('BOOKMARK_REMOVE', { bookmarkId: b._id })));
       return result.deletedCount;
     },
-    create: async (doc: Bookmark) => {
-      const bookmarkId = await mutations.create(doc);
+    create: async (doc) => {
+      const { insertedId: bookmarkId } = await Bookmarks.insertOne({
+        _id: generateDbObjectId(),
+        created: new Date(),
+        ...doc,
+      });
       await emit('BOOKMARK_CREATE', { bookmarkId });
       return bookmarkId;
     },
-    update: async (_id: string, doc: Bookmark) => {
-      const bookmarkId = await mutations.update(_id, doc);
+    update: async (bookmarkId, doc) => {
+      await Bookmarks.updateOne(
+        { _id: bookmarkId },
+        {
+          $set: {
+            updated: new Date(),
+            ...doc,
+          },
+        },
+      );
       await emit('BOOKMARK_UPDATE', { bookmarkId });
       return bookmarkId;
     },
     delete: async (bookmarkId) => {
-      const deletedCount = await mutations.delete(bookmarkId);
+      const { deletedCount } = await Bookmarks.deleteOne({ _id: bookmarkId });
       await emit('BOOKMARK_REMOVE', { bookmarkId });
       return deletedCount;
     },

package/src/service/bookmarkServices.ts

@@ -1,6 +1,11 @@
-import { BookmarkServices } from '@unchainedshop/types/bookmarks.js';
-import { migrateBookmarksService } from './migrateBookmarksService.js';
+import { MigrateBookmarksService, migrateBookmarksService } from './migrateBookmarksService.js';
+
+export interface BookmarkServices {
+  migrateBookmarks: MigrateBookmarksService;
+}
 
 export const bookmarkServices: BookmarkServices = {
   migrateBookmarks: migrateBookmarksService,
 };
+
+export type { MigrateBookmarksService };

package/src/service/migrateBookmarksService.ts

@@ -1,4 +1,14 @@
-import { MigrateBookmarksService } from '@unchainedshop/types/bookmarks.js';
+import { BookmarksModule } from '../bookmarks-index.js';
+
+export type MigrateBookmarksService = (
+  params: {
+    fromUserId: string;
+    toUserId: string;
+    shouldMerge: boolean;
+    countryContext: string;
+  },
+  unchainedAPI: { modules: { bookmarks: BookmarksModule } },
+) => Promise<void>;
 
 const hashBookmark = (bookmark) => {
   return `${bookmark.productId}:${bookmark.userId}:${JSON.stringify(bookmark.meta || {})}`;

package/tests/bookmarks-index.test.ts

@@ -1,7 +1,5 @@
 describe('Bookmark', () => {
-
-  it('Check Bookmarks module', async () => {
-   expect(true).toBeTruthy()
+  it('Check Bookmarks module', () => {
+    expect(true).toBeTruthy();
   });
-
 });

package/lib/db/BookmarksSchema.d.ts

@@ -1,3 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-export declare const BookmarkSchema: SimpleSchema;
-//# sourceMappingURL=BookmarksSchema.d.ts.map

package/lib/db/BookmarksSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BookmarksSchema.d.ts","sourceRoot":"","sources":["../../src/db/BookmarksSchema.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,cAAc,cAQ1B,CAAC"}

package/lib/db/BookmarksSchema.js

@@ -1,9 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-export const BookmarkSchema = new SimpleSchema({
-    userId: { type: String, required: true },
-    productId: { type: String, required: true },
-    meta: { type: Object, blackbox: true, required: false },
-    ...Schemas.timestampFields,
-}, { requiredByDefault: false });
-//# sourceMappingURL=BookmarksSchema.js.map

package/lib/db/BookmarksSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BookmarksSchema.js","sourceRoot":"","sources":["../../src/db/BookmarksSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,YAAY,CAC5C;IACE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACxC,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC3C,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;IACvD,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}

package/src/db/BookmarksSchema.ts

@@ -1,12 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-
-export const BookmarkSchema = new SimpleSchema(
-  {
-    userId: { type: String, required: true },
-    productId: { type: String, required: true },
-    meta: { type: Object, blackbox: true, required: false },
-    ...Schemas.timestampFields,
-  },
-  { requiredByDefault: false },
-);