@unchainedshop/api 4.8.19 → 4.8.20

package/lib/adminUiPlugins.d.ts

@@ -3,6 +3,7 @@ export interface AdminUIPluginEntityConfig {
     label: string;
     icon?: string;
     requiredRole?: string;
+    sortOrder?: number;
     components: {
         list: string;
         detail: string;
@@ -14,6 +15,7 @@ export interface AdminUIPluginPageConfig {
     label: string;
     icon?: string;
     requiredRole?: string;
+    sortOrder?: number;
     component: string;
 }
 export interface AdminUIPluginTabConfig {
@@ -36,6 +38,7 @@ export interface AdminUIPluginConfig {
         label: string;
         icon?: string;
         requiredRole?: string;
+        sortOrder?: number;
     };
     slots: {
         entities?: AdminUIPluginEntityConfig[];
@@ -58,9 +61,9 @@ interface StaticAsset {
 export interface PreparedPluginAssets {
     routes: Map<string, StaticAsset>;
     validPlugins: AdminUIPluginConfig[];
-    importMapTag: string | null;
 }
 export declare const resolveAdminUIPath: () => string | null;
+export declare const parseBundleExports: (bundle: string) => Set<string> | null;
 export declare function preparePluginAssets(plugins: AdminUIPluginConfig[], log: {
     info: (...args: any[]) => void;
     warn: (...args: any[]) => void;

package/lib/adminUiPlugins.js

@@ -1,18 +1,8 @@
 import { createHash } from 'node:crypto';
-import { existsSync, readFileSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { readFileSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
 const PLUGIN_NAME_RE = /^[a-z0-9]([a-z0-9_-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9_-]*[a-z0-9])?)*$/i;
 const IMMUTABLE_CACHE = 'public, max-age=31536000, immutable';
-const SDK_FILES = ['ui.mjs', 'form.mjs', 'hooks.mjs', 'providers.mjs', 'modal.mjs'];
-const IMPORT_MAP = {
-    imports: {
-        '@unchainedshop/admin-ui/ui': '/admin-ui-sdk/ui.mjs',
-        '@unchainedshop/admin-ui/form': '/admin-ui-sdk/form.mjs',
-        '@unchainedshop/admin-ui/hooks': '/admin-ui-sdk/hooks.mjs',
-        '@unchainedshop/admin-ui/modal': '/admin-ui-sdk/modal.mjs',
-        '@unchainedshop/admin-ui/providers': '/admin-ui-sdk/providers.mjs',
-    },
-};
 export const resolveAdminUIPath = () => {
     try {
         const staticURL = import.meta.resolve('@unchainedshop/admin-ui');
@@ -22,9 +12,46 @@ export const resolveAdminUIPath = () => {
         return null;
     }
 };
+const contentHash = (content) => createHash('sha256').update(content).digest('hex').slice(0, 8);
+export const parseBundleExports = (bundle) => {
+    const returnMatch = bundle.match(/return __toCommonJS\(([\w$]+)\);/);
+    if (!returnMatch)
+        return null;
+    const blockMatch = bundle.match(new RegExp(`__export\\(${returnMatch[1].replace(/\$/g, '\\$')},\\s*\\{([\\s\\S]*?)\\}\\);`));
+    if (!blockMatch)
+        return null;
+    const names = new Set();
+    for (const m of blockMatch[1].matchAll(/(?:^|,)\s*(?:"([^"]+)"|([\w$]+)):\s*\(\)\s*=>/g)) {
+        names.add(m[1] ?? m[2]);
+    }
+    return names.size > 0 ? names : null;
+};
+const collectReferencedComponents = (plugin) => {
+    const names = new Set();
+    for (const [slotId, configs] of Object.entries(plugin.slots || {})) {
+        if (!Array.isArray(configs))
+            continue;
+        for (const config of configs) {
+            if (slotId === 'entities') {
+                const components = config.components;
+                if (components?.list)
+                    names.add(components.list);
+                if (components?.detail)
+                    names.add(components.detail);
+                if (components?.create)
+                    names.add(components.create);
+            }
+            else if (typeof config.component === 'string') {
+                names.add(config.component);
+            }
+        }
+    }
+    return [...names];
+};
 export function preparePluginAssets(plugins, log, options = {}) {
     const { devMode = false } = options;
     const routes = new Map();
+    const devCacheControl = 'no-cache, no-store, must-revalidate';
     const validPlugins = plugins.filter((p) => {
         if (!PLUGIN_NAME_RE.test(p.name)) {
             log.warn(`Skipping admin-ui plugin with invalid name: "${p.name}"`);
@@ -32,42 +59,91 @@ export function preparePluginAssets(plugins, log, options = {}) {
         }
         return true;
     });
+    const seenNames = new Set();
+    for (const plugin of validPlugins) {
+        if (seenNames.has(plugin.name)) {
+            log.warn(`Duplicate admin-ui plugin name "${plugin.name}": later entries override earlier ones`);
+        }
+        seenNames.add(plugin.name);
+    }
     if (validPlugins.length > 0) {
         const pluginList = validPlugins
             .map((p) => `${p.name}${p.version ? `@${p.version}` : ''}`)
             .join(', ');
         log.info(`Loading ${validPlugins.length} admin-ui plugin(s): ${pluginList}`);
     }
-    const contentHash = (content) => createHash('sha256').update(content).digest('hex').slice(0, 8);
+    const resolvedBundlePaths = new Map();
     const pluginBundles = new Map();
     for (const plugin of validPlugins) {
         try {
-            const content = readFileSync(resolve(plugin.bundlePath), 'utf-8');
+            const bundlePath = resolve(plugin.bundlePath);
+            const content = readFileSync(bundlePath, 'utf-8');
+            resolvedBundlePaths.set(plugin.name, bundlePath);
             pluginBundles.set(plugin.name, { content, hash: contentHash(content) });
         }
         catch (err) {
             log.warn(`Failed to read bundle for plugin "${plugin.name}" at ${plugin.bundlePath}: ${err.message}`);
         }
     }
-    const manifestJSON = JSON.stringify(validPlugins
-        .filter((p) => pluginBundles.has(p.name))
-        .map((plugin) => {
-        const bundle = pluginBundles.get(plugin.name);
-        return {
-            ...Object.fromEntries(Object.entries(plugin).filter(([k]) => k !== 'bundlePath')),
-            bundleUrl: `/admin-plugins/${plugin.name}.js?v=${bundle.hash}`,
-        };
-    }));
-    const devCacheControl = 'no-cache, no-store, must-revalidate';
-    const manifestHash = contentHash(manifestJSON);
-    routes.set('/admin-ui-plugins.json', {
-        content: devMode ? () => manifestJSON : manifestJSON,
-        contentType: 'application/json',
-        cacheControl: devMode ? devCacheControl : `public, max-age=0, must-revalidate`,
-        etag: `"${manifestHash}"`,
-    });
-    for (const plugin of validPlugins.filter((p) => pluginBundles.has(p.name))) {
-        const bundlePath = resolve(plugin.bundlePath);
+    const pluginsWithBundles = validPlugins.filter((p) => pluginBundles.has(p.name));
+    for (const plugin of pluginsWithBundles) {
+        const exportNames = parseBundleExports(pluginBundles.get(plugin.name).content);
+        if (!exportNames)
+            continue;
+        const missing = collectReferencedComponents(plugin).filter((name) => !exportNames.has(name));
+        if (missing.length > 0) {
+            log.warn(`admin-ui plugin "${plugin.name}" references component(s) not exported by its bundle: ${missing.join(', ')}. Exported: ${[...exportNames].join(', ')}`);
+        }
+    }
+    const bundleMtimes = new Map();
+    const bundleHashes = new Map();
+    for (const [name, bundle] of pluginBundles) {
+        bundleHashes.set(name, bundle.hash);
+        try {
+            bundleMtimes.set(name, statSync(resolvedBundlePaths.get(name)).mtimeMs);
+        }
+        catch {
+        }
+    }
+    const refreshBundleHash = (name) => {
+        const bundlePath = resolvedBundlePaths.get(name);
+        try {
+            const currentMtime = statSync(bundlePath).mtimeMs;
+            const cachedMtime = bundleMtimes.get(name);
+            if (cachedMtime !== undefined && cachedMtime === currentMtime) {
+                return bundleHashes.get(name);
+            }
+            const hash = contentHash(readFileSync(bundlePath, 'utf-8'));
+            bundleMtimes.set(name, currentMtime);
+            bundleHashes.set(name, hash);
+            return hash;
+        }
+        catch {
+            return bundleHashes.get(name) ?? pluginBundles.get(name).hash;
+        }
+    };
+    const buildManifestJSON = () => JSON.stringify(pluginsWithBundles.map((plugin) => ({
+        ...Object.fromEntries(Object.entries(plugin).filter(([k]) => k !== 'bundlePath')),
+        bundleUrl: `/admin-plugins/${plugin.name}.js?v=${devMode ? refreshBundleHash(plugin.name) : pluginBundles.get(plugin.name).hash}`,
+    })));
+    if (devMode) {
+        routes.set('/admin-ui-plugins.json', {
+            content: buildManifestJSON,
+            contentType: 'application/json',
+            cacheControl: devCacheControl,
+        });
+    }
+    else {
+        const manifestJSON = buildManifestJSON();
+        routes.set('/admin-ui-plugins.json', {
+            content: manifestJSON,
+            contentType: 'application/json',
+            cacheControl: 'public, max-age=0, must-revalidate',
+            etag: `"${contentHash(manifestJSON)}"`,
+        });
+    }
+    for (const plugin of pluginsWithBundles) {
+        const bundlePath = resolvedBundlePaths.get(plugin.name);
         if (devMode) {
             routes.set(`/admin-plugins/${plugin.name}.js`, {
                 content: () => readFileSync(bundlePath, 'utf-8'),
@@ -84,28 +160,5 @@ export function preparePluginAssets(plugins, log, options = {}) {
             });
         }
     }
-    let importMapTag = null;
-    if (pluginBundles.size > 0) {
-        const adminUIPath = resolveAdminUIPath();
-        if (adminUIPath) {
-            for (const file of SDK_FILES) {
-                const sdkPath = join(adminUIPath, '..', 'dist', file);
-                if (existsSync(sdkPath)) {
-                    routes.set(`/admin-ui-sdk/${file}`, {
-                        content: readFileSync(sdkPath, 'utf-8'),
-                        contentType: 'application/javascript',
-                        cacheControl: IMMUTABLE_CACHE,
-                    });
-                }
-            }
-            const importMapJSON = JSON.stringify(IMPORT_MAP);
-            routes.set('/admin-ui-importmap.json', {
-                content: importMapJSON,
-                contentType: 'application/json',
-                cacheControl: IMMUTABLE_CACHE,
-            });
-            importMapTag = `<script type="importmap">${importMapJSON}</script>`;
-        }
-    }
-    return { routes, validPlugins, importMapTag };
+    return { routes, validPlugins };
 }

package/lib/createGraphQLServer.js

@@ -1,5 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
 import { createYoga, createSchema, } from 'graphql-yoga';
+import { useEngine } from '@envelop/core';
+import { parse, validate, specifiedRules, execute, subscribe } from 'graphql';
 const logger = createLogger('unchained:api');
 export default async (options) => {
     const schema = 'schema' in options
@@ -15,6 +17,10 @@ export default async (options) => {
             return ctx.req?.unchainedContext;
         },
         ...options,
+        plugins: [
+            useEngine({ parse, validate, specifiedRules, execute, subscribe }),
+            ...(options.plugins ?? []),
+        ],
     });
     return server;
 };

package/lib/mcp/tools/filter/handlers/createFilter.js

@@ -1,16 +1,14 @@
-import { FilterDirector } from '@unchainedshop/core';
 import { getNormalizedFilterDetails } from "../../../utils/getNormalizedFilterDetails.js";
 export default async function createFilter(context, params) {
-    const { modules } = context;
+    const { modules, services } = context;
     const { filter, texts } = params;
     const { key, type, options = [] } = filter;
-    const newFilter = await modules.filters.create({
+    const newFilter = await services.filters.createFilter({
         key,
         type,
         options,
         isActive: true,
     });
-    await FilterDirector.invalidateProductIdCache(newFilter, context);
     if (texts && texts.length > 0) {
         await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
     }

package/lib/mcp/tools/filter/handlers/createFilterOption.js

@@ -1,16 +1,14 @@
-import { FilterDirector } from '@unchainedshop/core';
 import { FilterNotFoundError } from "../../../../errors.js";
 import { getNormalizedFilterDetails } from "../../../utils/getNormalizedFilterDetails.js";
 export default async function createFilterOption(context, params) {
-    const { modules } = context;
+    const { modules, services } = context;
     const { filterId, option, optionTexts } = params;
     if (!(await modules.filters.filterExists({ filterId }))) {
         throw new FilterNotFoundError({ filterId });
     }
-    const newOption = await modules.filters.createFilterOption(filterId, { value: option });
+    const newOption = await services.filters.createFilterOption(filterId, { value: option });
     if (!newOption)
         return { filter: null };
-    await FilterDirector.invalidateProductIdCache(newOption, context);
     if (optionTexts && optionTexts.length > 0) {
         await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, optionTexts);
     }

package/lib/mcp/tools/filter/handlers/removeFilterOption.js

@@ -1,19 +1,17 @@
-import { FilterDirector } from '@unchainedshop/core';
 import { FilterNotFoundError } from "../../../../errors.js";
 import { getNormalizedFilterDetails } from "../../../utils/getNormalizedFilterDetails.js";
 export default async function removeFilterOption(context, params) {
-    const { modules } = context;
+    const { modules, services } = context;
     const { filterId, option } = params;
     if (!(await modules.filters.filterExists({ filterId }))) {
         throw new FilterNotFoundError({ filterId });
     }
-    const removedFilterOption = await modules.filters.removeFilterOption({
+    const removedFilterOption = await services.filters.removeFilterOption({
         filterId,
         filterOptionValue: option,
     });
     if (!removedFilterOption)
         return { filter: null };
-    await FilterDirector.invalidateProductIdCache(removedFilterOption, context);
     const normalizedFilter = await getNormalizedFilterDetails(filterId, context);
     return { filter: normalizedFilter };
 }

package/lib/mcp/tools/filter/handlers/updateFilter.js

@@ -1,12 +1,12 @@
 import { FilterNotFoundError } from "../../../../errors.js";
 import { getNormalizedFilterDetails } from "../../../utils/getNormalizedFilterDetails.js";
 export default async function updateFilter(context, params) {
-    const { modules } = context;
+    const { modules, services } = context;
     const { filterId, updateData } = params;
     if (!(await modules.filters.filterExists({ filterId }))) {
         throw new FilterNotFoundError({ filterId });
     }
-    await modules.filters.update(filterId, updateData);
+    await services.filters.updateFilter(filterId, updateData);
     const normalizedFilter = await getNormalizedFilterDetails(filterId, context);
     return { filter: normalizedFilter };
 }

package/lib/mcp/utils/sharedSchemas.d.ts

@@ -73,6 +73,7 @@ export declare function createMcpResponse(response: any): {
     }[];
 };
 export declare function createMcpErrorResponse(action: string, error: Error): {
+    isError: boolean;
     content: {
         type: "text";
         text: string;

package/lib/mcp/utils/sharedSchemas.js

@@ -88,6 +88,7 @@ export function createMcpResponse(response) {
 }
 export function createMcpErrorResponse(action, error) {
     return {
+        isError: true,
         content: [
             {
                 type: 'text',

package/lib/resolvers/mutations/filters/createFilter.js

@@ -1,12 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { DuplicateFilterKeyError } from "../../../errors.js";
 export default async function createFilter(root, { filter, texts }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log('mutation createFilter', { userId });
     try {
-        const newFilter = await modules.filters.create(filter);
-        await FilterDirector.invalidateProductIdCache(newFilter, context);
+        const newFilter = await services.filters.createFilter(filter);
         if (texts) {
             await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
         }

package/lib/resolvers/mutations/filters/createFilterOption.d.ts

@@ -4,4 +4,4 @@ export default function createFilterOption(root: never, params: {
     filterId: string;
     option: string;
     texts?: FilterInputText[];
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

package/lib/resolvers/mutations/filters/createFilterOption.js

@@ -1,16 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
 export default async function createFilterOption(root, params, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     const { filterId, option, texts } = params;
     log(`mutation createFilterOption ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.createFilterOption(filterId, { value: option });
-    await FilterDirector.invalidateProductIdCache(filter, context);
+    const filter = await services.filters.createFilterOption(filterId, { value: option });
     if (texts) {
         await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);
     }

package/lib/resolvers/mutations/filters/removeFilterOption.d.ts

@@ -2,4 +2,4 @@ import type { Context } from '../../../context.ts';
 export default function removeFilterOption(root: never, { filterId, filterOptionValue }: {
     filterId: string;
     filterOptionValue: string;
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

package/lib/resolvers/mutations/filters/removeFilterOption.js

@@ -1,17 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function removeFilterOption(root, { filterId, filterOptionValue }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation removeFilterOption ${filterId}`, { userId });
     if (!filterId || !filterOptionValue)
         throw new InvalidIdError({ filterId, filterOptionValue });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.removeFilterOption({
-        filterId,
-        filterOptionValue,
-    });
-    await FilterDirector.invalidateProductIdCache(filter, context);
-    return filter;
+    return services.filters.removeFilterOption({ filterId, filterOptionValue });
 }

package/lib/resolvers/mutations/filters/updateFilter.d.ts

@@ -3,4 +3,4 @@ import type { Context } from '../../../context.ts';
 export default function updateFilter(root: never, { filter, filterId }: {
     filter: Filter;
     filterId: string;
-}, context: Context): Promise<import("mongodb").WithId<Filter> | null>;
+}, context: Context): Promise<Filter | null>;

package/lib/resolvers/mutations/filters/updateFilter.js

@@ -1,14 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function updateFilter(root, { filter, filterId }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation updateFilter ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const updatedFilter = await modules.filters.update(filterId, filter);
-    await FilterDirector.invalidateProductIdCache(updatedFilter, context);
-    return updatedFilter;
+    return services.filters.updateFilter(filterId, filter);
 }

package/lib/resolvers/scalars/LowerCaseString.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLScalarType } from 'graphql';
-declare const LowerCaseString: GraphQLScalarType<string | null, any>;
+declare const LowerCaseString: GraphQLScalarType<string, any>;
 export default LowerCaseString;

package/lib/resolvers/scalars/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    LowerCaseString: import("graphql").GraphQLScalarType<string | null, any>;
+    LowerCaseString: import("graphql").GraphQLScalarType<string, any>;
 };
 export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/api",
   "description": "GraphQL API layer for the Unchained Engine with Express/Fastify adapters and MCP server",
-  "version": "4.8.19",
+  "version": "4.8.20",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -61,6 +61,7 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
     "@ai-sdk/mcp": "^2.0.29",
+    "graphql": ">= 16.14 < 18",
     "@fastify/cookie": ">= 11 < 12",
     "@fastify/multipart": ">= 9 < 11",
     "@fastify/session": ">= 11 < 12",
@@ -116,6 +117,7 @@
     }
   },
   "dependencies": {
+    "@envelop/core": "^5.6.0",
     "@unchainedshop/core": "^4.8.12",
     "@unchainedshop/events": "^4.8.12",
     "@unchainedshop/logger": "^4.8.12",
@@ -123,25 +125,26 @@
     "@unchainedshop/utils": "^4.8.12",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
-    "graphql-scalars": "^1.24.2",
+    "graphql-scalars": "^2.0.0",
     "mime": ">= 4 < 5",
     "p-memoize": "^8.0.0",
     "zod": "^3.25.76 || ^4"
   },
   "devDependencies": {
-    "@ai-sdk/mcp": "^2.0.29",
+    "@ai-sdk/mcp": "^2.0.34",
     "@fastify/cookie": "^11.0.2",
-    "@fastify/multipart": "^10.0.0",
+    "@fastify/multipart": "^10.1.1",
     "@fastify/session": "^11.1.0",
     "@fastify/static": "^10.1.3",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@types/express": "^5.0.3",
     "@types/express-session": "^1.18.2",
     "@types/node": "^26.2.0",
-    "ai": "^7.0.58",
+    "ai": "^7.0.73",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
-    "fastify": "^5.4.0",
+    "fastify": "^5.12.1",
+    "graphql": "^17.0.2",
     "multer": "^2.0.1",
     "passport": "^0.7.0",
     "typescript": "^5.8.3"