@unchainedshop/api 4.4.0 → 4.6.0

package/lib/resolvers/type/product/product-types.js

@@ -50,23 +50,13 @@ export const Product = {
     async reviewsCount(product, params, { modules }) {
         return modules.products.reviews.count({ ...params, productId: product._id });
     },
-    async siblings(product, params, { modules }) {
-        const { assortmentId, limit, offset, includeInactive = false } = params;
-        const productId = product._id;
-        const assortmentIds = assortmentId
-            ? [assortmentId]
-            : await modules.assortments.products.findAssortmentIds({ productId });
-        if (!assortmentIds.length)
-            return [];
-        const productIds = await modules.assortments.products.findSiblings({
-            productId,
-            assortmentIds,
-        });
-        return modules.products.findProducts({
-            productIds,
-            includeDrafts: includeInactive,
-            limit,
-            offset,
+    async siblings(product, params, { services }) {
+        return services.products.findProductSiblings({
+            product,
+            assortmentId: params.assortmentId,
+            limit: params.limit,
+            offset: params.offset,
+            includeInactive: params.includeInactive,
         });
     },
     status(product, _, { modules }) {

package/lib/resolvers/type/shop-types.js

@@ -1,5 +1,5 @@
 import { checkAction } from "../../acl.js";
-import { allRoles, actions } from "../../roles/index.js";
+import { actions, getPublicRoles } from "../../roles/index.js";
 export const Shop = {
     _id() {
         return 'root';
@@ -12,9 +12,6 @@ export const Shop = {
     },
     userRoles: async (_root, _params, context) => {
         await checkAction(context, actions.manageUsers);
-        return Object.values(allRoles)
-            .map((i) => i?.name)
-            .filter(Boolean)
-            .filter((name) => name.substring(0, 2) !== '__');
+        return getPublicRoles();
     },
 };

package/lib/resolvers/type/token-types.d.ts

@@ -1,12 +1,12 @@
 import type { Context } from '../../context.ts';
-import { type TokenSurrogate } from '@unchainedshop/core-warehousing';
+import type { TokenSurrogate } from '@unchainedshop/core-warehousing';
 export declare const Token: {
     product: (token: TokenSurrogate, params: never, { loaders }: Context) => Promise<import("@unchainedshop/core-products").Product>;
     user: (token: TokenSurrogate, params: never, { loaders }: Context) => Promise<import("@unchainedshop/core-users").User | null>;
-    status: (token: TokenSurrogate, params: never, { modules }: Context) => Promise<"DECENTRALIZED" | "EXPORTING" | "CENTRALIZED">;
+    status: (token: TokenSurrogate, params: never, { services }: Context) => Promise<import("@unchainedshop/core-warehousing").TokenStatus>;
     ercMetadata: (token: TokenSurrogate, { forceLocale }: {
         forceLocale: string;
     }, context: Context) => Promise<any>;
-    isInvalidateable: (token: TokenSurrogate, _params: never, context: Context) => Promise<boolean>;
+    isInvalidateable: (token: TokenSurrogate, _params: never, { services }: Context) => Promise<boolean>;
     accessKey: (token: TokenSurrogate, params: never, requestContext: Context) => Promise<string | null>;
 };

package/lib/resolvers/type/token-types.js

@@ -1,8 +1,5 @@
-import { TokenStatus, WarehousingProviderType, } from '@unchainedshop/core-warehousing';
-import { WorkStatus } from '@unchainedshop/core-worker';
 import { checkAction } from "../../acl.js";
 import { actions } from "../../roles/index.js";
-import { WarehousingDirector } from '@unchainedshop/core';
 export const Token = {
     product: async (token, params, { loaders }) => {
         return loaders.productLoader.load({ productId: token.productId });
@@ -12,17 +9,8 @@ export const Token = {
             return null;
         return loaders.userLoader.load({ userId: token.userId });
     },
-    status: async (token, params, { modules }) => {
-        if (token.walletAddress && !token.userId) {
-            return TokenStatus.DECENTRALIZED;
-        }
-        const workItems = await modules.worker.findWorkQueue({
-            types: ['EXPORT_TOKEN'],
-            status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
-        });
-        if (workItems.find((item) => item.input?.token?._id === token._id))
-            return TokenStatus.EXPORTING;
-        return TokenStatus.CENTRALIZED;
+    status: async (token, params, { services }) => {
+        return services.warehousing.resolveTokenStatus({ token });
     },
     ercMetadata: async (token, { forceLocale }, context) => {
         const { loaders, services } = context;
@@ -33,17 +21,8 @@ export const Token = {
             locale: forceLocale ? new Intl.Locale(forceLocale) : context.locale,
         });
     },
-    isInvalidateable: async (token, _params, context) => {
-        const { loaders } = context;
-        const product = await loaders.productLoader.load({ productId: token.productId });
-        const virtualProviders = (await context.modules.warehousing.allProviders()).filter(({ type }) => type === WarehousingProviderType.VIRTUAL);
-        const isInvalidateable = await WarehousingDirector.isInvalidateable(virtualProviders, {
-            token,
-            product,
-            quantity: token?.quantity || 1,
-            referenceDate: new Date(),
-        }, context);
-        return !!isInvalidateable;
+    isInvalidateable: async (token, _params, { services }) => {
+        return services.warehousing.isTokenInvalidateable({ token });
     },
     accessKey: async (token, params, requestContext) => {
         const { modules } = requestContext;

package/lib/resolvers/type/user-types.js

@@ -2,9 +2,6 @@ import { Roles, permissions } from '@unchainedshop/roles';
 import { checkAction, checkTypeResolver } from "../../acl.js";
 import { actions } from "../../roles/index.js";
 const { viewUserPrivateInfos, viewUserPublicInfos, viewUserOrders, viewUserEnrollments, viewUserQuotations, viewUserProductReviews, } = actions;
-const getPrimaryEmail = (user) => {
-    return (user.emails || []).toSorted((left, right) => Number(right.verified) - Number(left.verified))?.[0];
-};
 export const User = {
     _id: checkTypeResolver(viewUserPublicInfos, '_id'),
     created: checkTypeResolver(viewUserPrivateInfos, 'created'),
@@ -27,7 +24,7 @@ export const User = {
     },
     primaryEmail: async (user, params, context) => {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
-        return getPrimaryEmail(user);
+        return context.modules.users.primaryEmail(user);
     },
     isInitialPassword: async (user, params, context) => {
         await checkAction(context, viewUserPrivateInfos, [user, params]);

package/lib/resolvers/type/webauthn-credentials-types.d.ts

@@ -23,5 +23,14 @@ export declare const WebAuthnCredentials: {
         aaguid: string;
         counter: number;
         mdsMetadata: any;
-    }, _: never, { modules }: Context): Promise<any>;
+    }, _: never, { modules }: Context): Promise<{
+        [key: string]: unknown;
+        description?: string;
+        icon?: string;
+        authenticatorGetInfo?: {
+            versions?: string[];
+            extensions?: string[];
+            options?: Record<string, boolean>;
+        };
+    } | null>;
 };

package/lib/roles/index.d.ts

@@ -12,4 +12,5 @@ declare const configureRoles: ({ additionalRoles, additionalActions, }: {
     LOGGEDIN: import("@unchainedshop/roles").RoleInterface | undefined;
     ALL: import("@unchainedshop/roles").RoleInterface | undefined;
 };
-export { allRoles, actions, configureRoles };
+declare const getPublicRoles: () => string[];
+export { allRoles, actions, configureRoles, getPublicRoles };

package/lib/roles/index.js

@@ -137,4 +137,10 @@ const configureRoles = ({ additionalRoles, additionalActions, }) => {
     admin(allRoles.ADMIN, actions);
     return allRoles;
 };
-export { allRoles, actions, configureRoles };
+const getPublicRoles = () => {
+    return Object.values(allRoles)
+        .map((role) => role?.name)
+        .filter(Boolean)
+        .filter((name) => !name.startsWith('__'));
+};
+export { allRoles, actions, configureRoles, getPublicRoles };

package/lib/schema/mutation.js

@@ -627,12 +627,6 @@ export default [
       """
       updateAssortment(assortment: UpdateAssortmentInput!, assortmentId: ID!): Assortment!
 
-      """
-      Makes the assortment provided as the base assortment and make
-      any other existing base assortment regular assortments.
-      """
-      setBaseAssortment(assortmentId: ID!): Assortment!
-
       """
       Removes assortment with the provided ID
       """
@@ -789,7 +783,7 @@ export default [
       verifyQuotation(quotationId: ID!, quotationContext: JSON): Quotation!
 
       """
-      Reject an RFP, this is possible as long as a quotation is not fullfilled
+      Reject an RFP, this is possible as long as a quotation is not fulfilled
       """
       rejectQuotation(quotationId: ID!, quotationContext: JSON): Quotation!
 

package/lib/schema/types/assortment.js

@@ -24,7 +24,6 @@ export default [
       updated: DateTime
       deleted: DateTime
       isActive: Boolean
-      isBase: Boolean
       isRoot: Boolean
       sequence: Int!
       tags: [LowerCaseString!]

package/lib/schema/types/order/order.js

@@ -24,7 +24,7 @@ export default [
       """
       Order has been fulfilled completely (all positions in delivery)
       """
-      FULLFILLED
+      FULFILLED
     }
 
     enum OrderPriceCategory {
@@ -69,7 +69,7 @@ export default [
       delivery: OrderDelivery
       discounts: [OrderDiscount!]
       enrollment: Enrollment
-      fullfilled: DateTime
+      fulfilled: DateTime
       items: [OrderItem!]
       ordered: DateTime
       orderNumber: String

package/lib/schema/types/quotation.js

@@ -24,7 +24,7 @@ export default [
       """
       Quotation has been used to order the product
       """
-      FULLFILLED
+      FULFILLED
     }
 
     enum QuotationDocumentType {
@@ -52,7 +52,7 @@ export default [
       updated: DateTime
       isExpired(referenceDate: Timestamp): Boolean
       quotationNumber: String
-      fullfilled: DateTime
+      fulfilled: DateTime
       rejected: DateTime
       country: Country
       currency: Currency

package/lib/utils/getConfiguredTags.d.ts

@@ -0,0 +1 @@
+export declare function getConfiguredTags(existingTagsFn: () => Promise<string[]>, envVar: string, configDefault: string[] | undefined): Promise<string[]>;

package/lib/utils/getConfiguredTags.js

@@ -0,0 +1,9 @@
+export async function getConfiguredTags(existingTagsFn, envVar, configDefault) {
+    const existingTags = await existingTagsFn();
+    const envTags = (process.env[envVar] || '')
+        .split(',')
+        .map((t) => t.trim())
+        .filter(Boolean);
+    const normalizedDefaultTags = envTags?.length ? envTags : (configDefault || []).filter(Boolean);
+    return Array.from(new Set(normalizedDefaultTags.concat(existingTags)));
+}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@unchainedshop/api",
-  "version": "4.4.0",
+  "description": "GraphQL API layer for the Unchained Engine with Express/Fastify adapters and MCP server",
+  "version": "4.6.0",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": "./lib/api-index.js",
@@ -58,15 +60,13 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@ai-sdk/mcp": "^0.0.*",
+    "@ai-sdk/mcp": "^1",
     "@fastify/cookie": ">= 11 < 12",
     "@fastify/multipart": ">= 9 < 10",
     "@fastify/session": ">= 11 < 12",
-    "@fastify/static": ">= 8 < 9",
+    "@fastify/static": ">= 9 < 10",
     "@modelcontextprotocol/sdk": ">= 1 < 2",
-    "@noble/curves": "^2.0.0",
-    "@noble/hashes": "^2.0.0",
-    "ai": ">= 5 < 6",
+    "ai": ">= 6 < 7",
     "express": ">= 5 < 6",
     "express-session": ">= 1.18 < 2",
     "fastify": ">= 5.2 < 6",
@@ -113,41 +113,32 @@
     },
     "passport": {
       "optional": true
-    },
-    "@noble/curves": {
-      "optional": true
-    },
-    "@noble/hashes": {
-      "optional": true
     }
   },
   "dependencies": {
-    "@unchainedshop/core": "^4.4.0",
-    "@unchainedshop/events": "^4.4.0",
-    "@unchainedshop/logger": "^4.4.0",
-    "@unchainedshop/roles": "^4.4.0",
-    "@unchainedshop/utils": "^4.4.0",
+    "@unchainedshop/core": "^4.6.0",
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/roles": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
     "graphql-scalars": "^1.24.2",
     "mime": ">= 4 < 5",
-    "moniker": "0.1.2",
     "p-memoize": "^8.0.0",
     "zod": "^3.25.76 || ^4"
   },
   "devDependencies": {
-    "@ai-sdk/mcp": "^0.0.*",
+    "@ai-sdk/mcp": "^1.0.5",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^9.0.3",
     "@fastify/session": "^11.1.0",
-    "@fastify/static": "^8.2.0",
+    "@fastify/static": "^9.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
-    "@noble/curves": "^2.0.0",
-    "@noble/hashes": "^2.0.0",
     "@types/express": "^5.0.3",
     "@types/express-session": "^1.18.2",
     "@types/node": "^25.0.0",
-    "ai": "^5.0.80",
+    "ai": "^6.0.14",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
     "fastify": "^5.4.0",

package/lib/mcp/tools/assortment/handlers/setAssortmentBase.d.ts

@@ -1,28 +0,0 @@
-import type { Context } from '../../../../context.ts';
-import type { Params } from '../schemas.ts';
-export default function setAssortmentBase(context: Context, params: Params<'SET_BASE'>): Promise<{
-    assortment: {
-        texts: import("@unchainedshop/core-assortments").AssortmentText;
-        media: {
-            mediaId: string;
-        }[] | ({
-            file: any;
-            mediaId: string;
-        } | null)[];
-        childrenCount: number;
-        filters: import("@unchainedshop/core-assortments").AssortmentFilter[];
-        links: import("@unchainedshop/core-assortments").AssortmentLink[];
-        products: import("@unchainedshop/core-assortments").AssortmentProduct[];
-        isActive: boolean;
-        isBase: boolean;
-        isRoot: boolean;
-        meta?: any;
-        sequence: number;
-        slugs?: string[] | undefined;
-        tags: string[];
-        created: Date;
-        updated?: Date | undefined;
-        deleted?: (Date | null) | undefined;
-        _id: string;
-    } | null;
-}>;

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

@@ -1,11 +0,0 @@
-import { AssortmentNotFoundError } from "../../../../errors.js";
-import { getNormalizedAssortmentDetails } from "../../../utils/getNormalizedAssortmentDetails.js";
-export default async function setAssortmentBase(context, params) {
-    const { modules } = context;
-    const { assortmentId } = params;
-    const existingAssortment = await modules.assortments.findAssortment({ assortmentId });
-    if (!existingAssortment)
-        throw new AssortmentNotFoundError({ assortmentId });
-    await modules.assortments.setBase(assortmentId);
-    return { assortment: await getNormalizedAssortmentDetails({ assortmentId }, context) };
-}

package/lib/resolvers/mutations/assortments/setBaseAssortment.d.ts

@@ -1,4 +0,0 @@
-import type { Context } from '../../../context.ts';
-export default function setBaseAssortment(root: never, { assortmentId }: {
-    assortmentId: string;
-}, { modules, userId }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-assortments").Assortment> | null>;

package/lib/resolvers/mutations/assortments/setBaseAssortment.js

@@ -1,11 +0,0 @@
-import { log } from '@unchainedshop/logger';
-import { AssortmentNotFoundError, InvalidIdError } from "../../../errors.js";
-export default async function setBaseAssortment(root, { assortmentId }, { modules, userId }) {
-    log(`mutation setBaseAssortment ${assortmentId}`, { userId });
-    if (!assortmentId)
-        throw new InvalidIdError({ assortmentId });
-    if (!(await modules.assortments.assortmentExists({ assortmentId })))
-        throw new AssortmentNotFoundError({ assortmentId });
-    await modules.assortments.setBase(assortmentId);
-    return modules.assortments.findAssortment({ assortmentId });
-}