@unchainedshop/api 5.0.0-alpha.3 → 5.0.0-alpha.5

package/lib/express/index.js

@@ -1,39 +1,59 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import e from 'express';
 import cookieParser from 'cookie-parser';
 import { pluginRegistry } from '@unchainedshop/core';
 import { createHash } from 'node:crypto';
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
+import { runWithAuditContext } from '@unchainedshop/events';
 import { getCurrentContextResolver } from "../context.js";
 import { createAuthContext } from "../middleware/createAuthMiddleware.js";
 import createMCPMiddleware from "./createMCPMiddleware.js";
 import { connectChat } from "./chatHandler.js";
 import { mountRoutes } from "./mountRoutes.js";
 import { createBackchannelLogoutRoute } from "../handlers/createBackchannelLogoutHandler.js";
-import { generateThemeCSS } from '@unchainedshop/admin-ui/theme';
-import { preparePluginAssets, resolveAdminUIPath } from "../adminUiPlugins.js";
+import { preparePluginAssets, prepareAdminUIHTML, resolveAdminUIHTML, injectAdminUIImportMap, buildImportMapTag, resolveAdminUIPath, } from "../adminUiPlugins.js";
 export const adminUIRouter = (enabled = true, theme, plugins = []) => {
     const router = e.Router();
     const adminUIPath = resolveAdminUIPath();
     if (!adminUIPath)
         return router;
     if (enabled) {
-        const themeCSS = generateThemeCSS(theme);
-        const themeHash = createHash('sha256').update(themeCSS).digest('hex').slice(0, 8);
-        const themeEtag = `"${themeHash}"`;
-        router.get('/admin-ui-theme.css', (req, res) => {
-            if (req.headers['if-none-match'] === themeEtag) {
+        let themePromise;
+        const resolveThemeCSS = async () => {
+            let css = '/* default theme */';
+            if (theme) {
+                try {
+                    const themeModuleUrl = import.meta.resolve('@unchainedshop/admin-ui/theme');
+                    const { generateThemeCSS } = await import(__rewriteRelativeImportExtension(themeModuleUrl));
+                    css = generateThemeCSS(theme);
+                }
+                catch {
+                    console.warn("npm dependency @unchainedshop/admin-ui is not installed, can't apply admin-ui theme");
+                }
+            }
+            const etag = `"${createHash('sha256').update(css).digest('hex').slice(0, 8)}"`;
+            return { css, etag };
+        };
+        router.get('/admin-ui-theme.css', async (req, res) => {
+            const { css, etag } = await (themePromise ||= resolveThemeCSS());
+            if (req.headers['if-none-match'] === etag) {
                 return res.status(304).end();
             }
             res
                 .set('Cache-Control', 'public, max-age=0, must-revalidate')
-                .set('ETag', themeEtag)
+                .set('ETag', etag)
                 .type('text/css')
-                .send(themeCSS);
+                .send(css);
         });
         const log = { info: console.info, warn: console.warn };
         const devMode = process.env.NODE_ENV !== 'production';
-        const { routes: pluginRoutes } = preparePluginAssets(plugins, log, { devMode });
+        const { routes: pluginRoutes, importMapTag, importMapJSON, } = preparePluginAssets(plugins, log, { devMode });
         for (const [path, asset] of pluginRoutes) {
             router.get(path, (req, res) => {
                 if (asset.etag) {
@@ -51,16 +71,23 @@ export const adminUIRouter = (enabled = true, theme, plugins = []) => {
                     .send(body);
             });
         }
-        router.use(e.static(adminUIPath));
-        const extHtmlPath = join(adminUIPath, 'ext', '[[...slug]]', 'index.html');
-        const hasExtHtml = existsSync(extHtmlPath);
-        router.get(/(.*)/, (req, res) => {
-            const urlPath = req.path.replace(/\/+$/, '');
-            if (hasExtHtml && (urlPath === '/ext' || urlPath.startsWith('/ext/'))) {
-                return res.sendFile(extHtmlPath);
-            }
-            return res.sendFile(join(adminUIPath, 'index.html'));
-        });
+        router.use(e.static(adminUIPath, importMapTag ? { index: false } : undefined));
+        if (importMapJSON) {
+            const preparedHTML = prepareAdminUIHTML(adminUIPath);
+            router.get(/(.*)/, (req, res) => {
+                if (devMode)
+                    res.set('Cache-Control', 'no-cache');
+                const nonce = res.locals?.cspNonce;
+                const tag = nonce ? buildImportMapTag(importMapJSON, nonce) : importMapTag;
+                return res.type('text/html').send(injectAdminUIImportMap(preparedHTML, req.path, tag));
+            });
+        }
+        else {
+            const preparedHTML = prepareAdminUIHTML(adminUIPath);
+            router.get(/(.*)/, (req, res) => {
+                return res.type('text/html').send(resolveAdminUIHTML(preparedHTML, req.path));
+            });
+        }
     }
     return router;
 };
@@ -100,7 +127,7 @@ const createAddContextMiddleware = (authConfig, trustProxy = false) => async fun
         };
         const authContext = await createAuthContext(authContextParams, authConfig);
         const context = getCurrentContextResolver();
-        req.unchainedContext = await context({
+        const unchainedContext = await context({
             setHeader,
             getHeader,
             remoteAddress,
@@ -112,6 +139,12 @@ const createAddContextMiddleware = (authConfig, trustProxy = false) => async fun
             impersonatorId: authContext.impersonatorId,
             tokenVersion: authContext.tokenVersion,
         }, req, res);
+        req.unchainedContext = unchainedContext;
+        req._auditContext = {
+            userId: unchainedContext.userId,
+            userName: unchainedContext.user?.username || unchainedContext.user?.emails?.[0]?.address,
+            remoteAddress,
+        };
         next();
     }
     catch (error) {
@@ -140,7 +173,13 @@ export const connect = async (expressApp, { graphqlHandler, unchainedAPI, }, { a
     }
     expressApp.use(cookieParser());
     expressApp.use(createAddContextMiddleware(authConfig, trustProxy || allowRemoteToLocalhostSecureCookies));
-    expressApp.use(graphqlHandler.graphqlEndpoint, graphqlHandler.handle);
+    expressApp.use(graphqlHandler.graphqlEndpoint, (req, res) => {
+        const auditCtx = req._auditContext;
+        if (auditCtx) {
+            return runWithAuditContext(auditCtx, () => graphqlHandler.handle(req, res));
+        }
+        return graphqlHandler.handle(req, res);
+    });
     expressApp.use(MCP_API_PATH, e.json({ limit: '10mb' }));
     expressApp.use(MCP_API_PATH, createMCPMiddleware);
     if (chat) {

package/lib/fastify/chatHandler.js

@@ -39,6 +39,14 @@ const setupMCPChatHandler = (chatConfiguration) => {
             });
             return res.status(200).send();
         }
+        const unchainedContext = req.unchainedContext;
+        const user = unchainedContext?.user;
+        if (!user) {
+            return res.status(401).send({ error: 'unauthorized' });
+        }
+        if (!(user.roles || []).includes('admin')) {
+            return res.status(403).send({ error: 'forbidden', message: 'Chat requires admin privileges' });
+        }
         let client;
         const lifecycle = createChatRequestLifecycle(res.raw, configuredAbortSignal);
         try {
@@ -48,13 +56,14 @@ const setupMCPChatHandler = (chatConfiguration) => {
                     url: unchainedMCPUrl,
                     headers: {
                         Cookie: req.headers.cookie || '',
+                        ...(req.headers.authorization ? { Authorization: req.headers.authorization } : {}),
                     },
                 },
                 initializationOptions: { signal: lifecycle.signal },
             });
             lifecycle.setClientClose(() => client.close());
             const defaultUnchainedTools = await client.tools();
-            const resourceContext = await buildChatResourceContext(req.unchainedContext);
+            const resourceContext = await buildChatResourceContext(unchainedContext);
             const tools = {
                 ...defaultUnchainedTools,
                 ...additionalTools,

package/lib/fastify/index.d.ts

@@ -4,15 +4,15 @@ import type { UnchainedCore } from '@unchainedshop/core';
 import type { FastifyBaseLogger, FastifyInstance, FastifyPluginAsync } from 'fastify';
 import { connectChat } from './chatHandler.ts';
 import type { ChatConfiguration } from '../chat/utils.ts';
-import { type AdminUIThemeConfig } from '@unchainedshop/admin-ui/theme';
-import { type AdminUIPluginConfig } from '../adminUiPlugins.ts';
-export type { AdminUIPluginConfig, AdminUIPluginEntityConfig, AdminUIPluginPageConfig, AdminUIPluginTabConfig, AdminUIPluginWidgetConfig, AdminUIPluginSlotConfig, } from '../adminUiPlugins.ts';
-export type { AdminUIThemeTokens, AdminUIThemeConfig } from '@unchainedshop/admin-ui/theme';
+import { type AdminUIPluginConfig, type AdminUIThemeConfig } from '../adminUiPlugins.ts';
+export type { AdminUIPluginConfig, AdminUIPluginEntityConfig, AdminUIPluginPageConfig, AdminUIPluginTabConfig, AdminUIPluginWidgetConfig, AdminUIPluginSlotConfig, AdminUIThemeTokens, AdminUIThemeConfig, } from '../adminUiPlugins.ts';
 export interface AdminUIRouterOptions {
     prefix?: string;
     enabled?: boolean;
     theme?: AdminUIThemeConfig;
     plugins?: AdminUIPluginConfig[];
+    importMapTag?: string | null;
+    importMapJSON?: string | null;
 }
 export declare const unchainedLogger: (prefix: string) => FastifyBaseLogger;
 export declare const connect: (fastify: FastifyInstance, { graphqlHandler, unchainedAPI, }: {

package/lib/fastify/index.js

@@ -1,3 +1,12 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+import { runWithAuditContext } from '@unchainedshop/events';
 import { getCurrentContextResolver } from "../context.js";
 import { createAuthContext } from "../middleware/createAuthMiddleware.js";
 import { pluginRegistry } from '@unchainedshop/core';
@@ -7,11 +16,9 @@ import mcpHandler from "./mcpHandler.js";
 import { connectChat } from "./chatHandler.js";
 import { mountRoutes } from "./mountRoutes.js";
 import { createHash } from 'node:crypto';
-import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { readFileSync } from 'node:fs';
 import { createBackchannelLogoutRoute } from "../handlers/createBackchannelLogoutHandler.js";
-import { generateThemeCSS } from '@unchainedshop/admin-ui/theme';
-import { preparePluginAssets, resolveAdminUIPath } from "../adminUiPlugins.js";
+import { preparePluginAssets, prepareAdminUIHTML, resolveAdminUIHTML, injectAdminUIImportMap, buildImportMapTag, resolveAdminUIPath, } from "../adminUiPlugins.js";
 const resolveUserRemoteAddress = (req, trustProxy = false) => {
     let remoteAddress;
     if (trustProxy) {
@@ -47,7 +54,7 @@ const createMiddlewareHook = (authConfig, trustProxy = false) => async function
     };
     const authContext = await createAuthContext(authContextParams, authConfig);
     const context = getCurrentContextResolver();
-    req.unchainedContext = await context({
+    const unchainedContext = await context({
         setHeader,
         getHeader,
         remoteAddress,
@@ -59,6 +66,12 @@ const createMiddlewareHook = (authConfig, trustProxy = false) => async function
         impersonatorId: authContext.impersonatorId,
         tokenVersion: authContext.tokenVersion,
     }, req, reply);
+    req.unchainedContext = unchainedContext;
+    req._auditContext = {
+        userId: unchainedContext.userId,
+        userName: unchainedContext.user?.username || unchainedContext.user?.emails?.[0]?.address,
+        remoteAddress,
+    };
 };
 export const unchainedLogger = (prefix) => {
     const logger = createLogger(prefix);
@@ -104,10 +117,15 @@ export const connect = async (fastify, { graphqlHandler, unchainedAPI, }, { allo
         url: graphqlHandler.graphqlEndpoint,
         method: ['GET', 'POST', 'OPTIONS'],
         handler: async (req, reply) => {
-            return graphqlHandler.handleNodeRequestAndResponse(req, reply, {
+            const auditCtx = req._auditContext;
+            const handle = () => graphqlHandler.handleNodeRequestAndResponse(req, reply, {
                 req,
                 reply,
             });
+            if (auditCtx) {
+                return runWithAuditContext(auditCtx, handle);
+            }
+            return handle();
         },
     });
     fastify.route({
@@ -126,21 +144,35 @@ export const connect = async (fastify, { graphqlHandler, unchainedAPI, }, { allo
     if (adminUI) {
         const adminUIOptions = typeof adminUI === 'object' ? adminUI : undefined;
         const adminUIPlugins = adminUIOptions?.plugins || [];
-        const themeCSS = generateThemeCSS(adminUIOptions?.theme);
-        const themeHash = createHash('sha256').update(themeCSS).digest('hex').slice(0, 8);
-        const themeEtag = `"${themeHash}"`;
+        let themePromise;
+        const resolveThemeCSS = async () => {
+            let css = '/* default theme */';
+            if (adminUIOptions?.theme) {
+                try {
+                    const themeModuleUrl = import.meta.resolve('@unchainedshop/admin-ui/theme');
+                    const { generateThemeCSS } = await import(__rewriteRelativeImportExtension(themeModuleUrl));
+                    css = generateThemeCSS(adminUIOptions.theme);
+                }
+                catch {
+                    fastify.log.warn("npm dependency @unchainedshop/admin-ui is not installed, can't apply admin-ui theme");
+                }
+            }
+            const etag = `"${createHash('sha256').update(css).digest('hex').slice(0, 8)}"`;
+            return { css, etag };
+        };
         fastify.get('/admin-ui-theme.css', async (request, reply) => {
-            if (request.headers['if-none-match'] === themeEtag) {
+            const { css, etag } = await (themePromise ||= resolveThemeCSS());
+            if (request.headers['if-none-match'] === etag) {
                 return reply.code(304).send();
             }
             return reply
                 .header('Cache-Control', 'public, max-age=0, must-revalidate')
-                .header('ETag', themeEtag)
+                .header('ETag', etag)
                 .type('text/css')
-                .send(themeCSS);
+                .send(css);
         });
         const devMode = process.env.NODE_ENV !== 'production';
-        const { routes: pluginRoutes } = preparePluginAssets(adminUIPlugins, fastify.log, {
+        const { routes: pluginRoutes, importMapTag, importMapJSON, } = preparePluginAssets(adminUIPlugins, fastify.log, {
             devMode,
         });
         for (const [path, asset] of pluginRoutes) {
@@ -165,6 +197,8 @@ export const connect = async (fastify, { graphqlHandler, unchainedAPI, }, { allo
             enabled: true,
             prefix: adminUIOptions?.prefix || '/',
             plugins: adminUIPlugins,
+            importMapTag,
+            importMapJSON,
         });
     }
 };
@@ -197,24 +231,43 @@ export const adminUIRouter = async (fastify, opts) => {
         if (fastifyStatic) {
             const adminUIPath = resolveAdminUIPath();
             if (adminUIPath) {
-                const indexHtml = readFileSync(join(adminUIPath, 'index.html'), 'utf-8');
-                const extHtmlPath = join(adminUIPath, 'ext', '[[...slug]]', 'index.html');
-                const extHtml = existsSync(extHtmlPath) ? readFileSync(extHtmlPath, 'utf-8') : null;
-                await fastify.register(fastifyStatic, {
-                    root: adminUIPath,
-                    prefix: opts.prefix || '/',
-                    wildcard: false,
-                });
-                fastify.setNotFoundHandler(async (request, reply) => {
-                    if (request.method === 'GET' && !request.url.includes('.')) {
-                        const urlPath = request.url.split('?')[0].replace(/\/+$/, '');
-                        if (extHtml && (urlPath === '/ext' || urlPath.startsWith('/ext/'))) {
-                            return reply.type('text/html').send(extHtml);
+                if (opts.importMapJSON) {
+                    const preparedHTML = prepareAdminUIHTML(adminUIPath);
+                    await fastify.register(fastifyStatic, {
+                        root: adminUIPath,
+                        prefix: opts.prefix || '/',
+                        wildcard: false,
+                        index: false,
+                    });
+                    fastify.setNotFoundHandler(async (request, reply) => {
+                        if (request.method === 'GET' && !request.url.includes('.')) {
+                            if (process.env.NODE_ENV !== 'production')
+                                reply.header('Cache-Control', 'no-cache');
+                            const nonce = reply.cspNonce?.script;
+                            const tag = nonce ? buildImportMapTag(opts.importMapJSON, nonce) : opts.importMapTag;
+                            return reply
+                                .type('text/html')
+                                .send(injectAdminUIImportMap(preparedHTML, request.url, tag, opts.prefix));
                         }
-                        return reply.type('text/html').send(indexHtml);
-                    }
-                    return reply.code(404).send({ error: 'Not Found' });
-                });
+                        return reply.code(404).send({ error: 'Not Found' });
+                    });
+                }
+                else {
+                    const preparedHTML = prepareAdminUIHTML(adminUIPath);
+                    await fastify.register(fastifyStatic, {
+                        root: adminUIPath,
+                        prefix: opts.prefix || '/',
+                        wildcard: false,
+                    });
+                    fastify.setNotFoundHandler(async (request, reply) => {
+                        if (request.method === 'GET' && !request.url.includes('.')) {
+                            return reply
+                                .type('text/html')
+                                .send(resolveAdminUIHTML(preparedHTML, request.url, opts.prefix));
+                        }
+                        return reply.code(404).send({ error: 'Not Found' });
+                    });
+                }
                 return;
             }
         }

package/lib/loaders/assortmentLinksLoader.js

@@ -1,38 +1,40 @@
 import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
-    const parentAssortmentIds = queries.flatMap((q) => q.parentAssortmentId).filter(Boolean);
-    const childAssortmentIds = queries.flatMap((q) => q.childAssortmentId).filter(Boolean);
-    const assortmentIds = queries.flatMap((q) => q.assortmentId).filter(Boolean);
+    const parentAssortmentIds = [
+        ...new Set(queries.flatMap((q) => q.parentAssortmentId).filter(Boolean)),
+    ];
+    const childAssortmentIds = [
+        ...new Set(queries.flatMap((q) => q.childAssortmentId).filter(Boolean)),
+    ];
+    const assortmentIds = [
+        ...new Set(queries.flatMap((q) => q.assortmentId).filter(Boolean)),
+    ];
     const allLinks = await unchainedAPI.modules.assortments.links.findLinks({
-        assortmentIds: [...new Set([...parentAssortmentIds, ...childAssortmentIds, ...assortmentIds])],
+        ...(parentAssortmentIds.length ? { parentAssortmentIds } : {}),
+        ...(childAssortmentIds.length ? { childAssortmentIds } : {}),
+        ...(assortmentIds.length ? { assortmentIds } : {}),
     });
-    const parentAssortmentLinkMap = {};
-    const childAssortmentLinkMap = {};
+    const parentAssortmentLinkMap = new Map();
+    const childAssortmentLinkMap = new Map();
     for (const link of allLinks) {
-        if (!parentAssortmentLinkMap[link.parentAssortmentId]) {
-            parentAssortmentLinkMap[link.parentAssortmentId] = [link];
-        }
-        else {
-            parentAssortmentLinkMap[link.parentAssortmentId].push(link);
-        }
-        if (!childAssortmentLinkMap[link.childAssortmentId]) {
-            childAssortmentLinkMap[link.childAssortmentId] = [link];
-        }
-        else {
-            childAssortmentLinkMap[link.childAssortmentId].push(link);
-        }
+        const parentLinks = parentAssortmentLinkMap.get(link.parentAssortmentId) || [];
+        parentLinks.push(link);
+        parentAssortmentLinkMap.set(link.parentAssortmentId, parentLinks);
+        const childLinks = childAssortmentLinkMap.get(link.childAssortmentId) || [];
+        childLinks.push(link);
+        childAssortmentLinkMap.set(link.childAssortmentId, childLinks);
     }
     return queries.map((q) => {
         if (q.parentAssortmentId) {
-            return parentAssortmentLinkMap[q.parentAssortmentId] || [];
+            return parentAssortmentLinkMap.get(q.parentAssortmentId) || [];
         }
         else if (q.childAssortmentId) {
-            return childAssortmentLinkMap[q.childAssortmentId] || [];
+            return childAssortmentLinkMap.get(q.childAssortmentId) || [];
         }
         if (q.assortmentId) {
             return [
-                ...(parentAssortmentLinkMap[q.assortmentId] || []),
-                ...(childAssortmentLinkMap[q.assortmentId] || []),
+                ...(parentAssortmentLinkMap.get(q.assortmentId) || []),
+                ...(childAssortmentLinkMap.get(q.assortmentId) || []),
             ];
         }
         return [];

package/lib/loaders/assortmentMediaTextLoader.js

@@ -6,6 +6,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts({ assortmentMediaIds }, {
         sort: {
             assortmentMediaId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/loaders/assortmentProductLoader.js

@@ -1,13 +1,16 @@
 import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+    const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
     const assortmentProducts = await unchainedAPI.modules.assortments.products.findAssortmentProducts({
         assortmentIds,
+        productIds,
     });
-    const assortmentProductMap = {};
+    const assortmentProductMap = new Map();
     for (const assortmentProduct of assortmentProducts) {
-        assortmentProductMap[assortmentProduct.assortmentId + assortmentProduct.productId] =
-            assortmentProduct;
+        const productsById = assortmentProductMap.get(assortmentProduct.assortmentId) || new Map();
+        productsById.set(assortmentProduct.productId, assortmentProduct);
+        assortmentProductMap.set(assortmentProduct.assortmentId, productsById);
     }
-    return queries.map((q) => assortmentProductMap[q.assortmentId + q.productId]);
+    return queries.map((q) => assortmentProductMap.get(q.assortmentId)?.get(q.productId));
 });

package/lib/loaders/assortmentTextLoader.js

@@ -6,6 +6,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentIds }, {
         sort: {
             assortmentId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/loaders/filterTextLoader.js

@@ -6,6 +6,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterIds }, {
         sort: {
             filterId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/loaders/productMediaTextLoader.js

@@ -6,6 +6,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts({ productMediaIds }, {
         sort: {
             productMediaId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/loaders/productTextLoader.js

@@ -6,6 +6,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const texts = await unchainedAPI.modules.products.texts.findTexts({ productIds }, {
         sort: {
             productId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/loaders/productVariationTextLoader.js

@@ -8,6 +8,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     }, {
         sort: {
             productVariationId: 1,
+            _id: 1,
         },
     });
     const localeMap = buildLocaleMap(queries, texts);

package/lib/mcp/tools/assortment/handlers/getAssortmentFilters.js

@@ -7,7 +7,7 @@ export default async function getAssortmentFilters(context, params) {
     const assortment = await getNormalizedAssortmentDetails({ assortmentId }, context);
     if (!assortment)
         throw new AssortmentNotFoundError({ assortmentId });
-    const filters = await modules.assortments.filters.findFilters({ assortmentId }, { sort: { sortKey: 1 } });
+    const filters = await modules.assortments.filters.findFilters({ assortmentId }, { sort: { sortKey: 1, _id: 1 } });
     const filters_normalized = await Promise.all(filters?.map(async ({ filterId, ...rest }) => ({
         ...(await getNormalizedFilterDetails(filterId, context)),
         ...rest,

package/lib/mcp/tools/assortment/handlers/getAssortmentProducts.js

@@ -7,7 +7,7 @@ export default async function getAssortmentProducts(context, params) {
     const assortment = await getNormalizedAssortmentDetails({ assortmentId }, context);
     if (!assortment)
         throw new AssortmentNotFoundError({ assortmentId });
-    const assortmentProducts = await modules.assortments.products.findAssortmentProducts({ assortmentId }, { sort: { sortKey: 1 } });
+    const assortmentProducts = await modules.assortments.products.findAssortmentProducts({ assortmentId }, { sort: { sortKey: 1, _id: 1 } });
     const products = await Promise.all(assortmentProducts?.map(async ({ productId, ...rest }) => ({
         ...(await getNormalizedProductDetails(productId, context)),
         ...rest,

package/lib/mcp/tools/system/handlers/allocateWork.js

@@ -1,8 +1,8 @@
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
+import { WorkerDirector } from '@unchainedshop/core';
 const allocateWork = async (context, options) => {
-    const { modules } = context;
     const removePrivateFieldsFromWork = buildObfuscatedFieldsFilter(context.options.worker?.blacklistedVariables);
-    const work = await modules.worker.allocateWork({
+    const work = await WorkerDirector.allocateWork(context, {
         types: options.types || [],
         worker: options.worker || '',
     });

package/lib/mcp/tools/users/handlers/getUserPaymentCredentials.js

@@ -4,6 +4,7 @@ export default async function getUserPaymentCredentials(context, params) {
     const credentials = await modules.payment.paymentCredentials.findPaymentCredentials({ userId }, {
         sort: {
             created: -1,
+            _id: -1,
         },
     });
     return { credentials };

package/lib/mcp/tools/users/index.js

@@ -1,7 +1,7 @@
 import { usersManagement, UsersManagementSchema } from "./usersManagement.js";
 export const registerUsersTools = (server, context) => {
     server.registerTool('users_management', {
-        description: 'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.',
+        description: 'User management for Unchained e-commerce. Actions: LIST, COUNT, GET, CREATE, UPDATE, REMOVE, ENROLL (create + send enrollment email), SET_TAGS, SET_USERNAME, ADD_EMAIL, REMOVE_EMAIL, SEND_ENROLLMENT_EMAIL, SEND_VERIFICATION_EMAIL, GET_ORDERS, GET_ENROLLMENTS, GET_QUOTATIONS, GET_BOOKMARKS, GET_PAYMENT_CREDENTIALS, GET_AVATAR, GET_REVIEWS, GET_REVIEWS_COUNT, REMOVE_PRODUCT_REVIEWS, GET_CURRENT_USER. LIST supports pagination, sorting, search, and filters for guests, email verification, and last login; COUNT supports the same search and filter criteria.',
         inputSchema: UsersManagementSchema,
     }, async (params) => usersManagement(context, params));
 };

package/lib/mcp/utils/getNormalizedAssortmentDetails.js

@@ -9,7 +9,7 @@ export async function getNormalizedAssortmentDetails({ assortmentId, slug }, con
         assortmentId: normalizedAssortmentId,
         locale,
     });
-    const filters = await modules.assortments.filters.findFilters({ assortmentId: assortment._id }, { sort: { sortKey: 1 } });
+    const filters = await modules.assortments.filters.findFilters({ assortmentId: assortment._id }, { sort: { sortKey: 1, _id: 1 } });
     const assortmentMedias = await modules.assortments.media.findAssortmentMedias({
         assortmentId: normalizedAssortmentId,
     });
@@ -19,7 +19,7 @@ export async function getNormalizedAssortmentDetails({ assortmentId, slug }, con
     const links = (await loaders.assortmentLinksLoader.load({
         assortmentId: assortment._id,
     })) || [];
-    const products = await modules.assortments.products.findAssortmentProducts({ assortmentId: assortment._id }, { sort: { sortKey: 1 } });
+    const products = await modules.assortments.products.findAssortmentProducts({ assortmentId: assortment._id }, { sort: { sortKey: 1, _id: 1 } });
     const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
     const childrenCount = await modules.assortments.count({
         assortmentIds,

package/lib/mcp/utils/getNormalizedUserDetails.js

@@ -38,6 +38,7 @@ export async function getNormalizedUserDetails(userId, context) {
     const paymentCredentials = await modules.payment.paymentCredentials.findPaymentCredentials({ userId: user._id }, {
         sort: {
             created: -1,
+            _id: -1,
         },
     });
     const quotations = await modules.quotations.findQuotations({