@unchainedshop/api 4.8.10 → 4.8.12

package/lib/loaders/enrollmentByOrderLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { Enrollment } from '@unchainedshop/core-enrollments';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, Enrollment | null, {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/enrollmentByOrderLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const requestedOrderIds = new Set(orderIds);
+    const enrollments = await unchainedAPI.modules.enrollments.findEnrollmentsByOrderIds({
+        orderIds,
+    });
+    const enrollmentMap = {};
+    for (const enrollment of enrollments) {
+        for (const period of enrollment.periods || []) {
+            if (period.orderId && requestedOrderIds.has(period.orderId) && !enrollmentMap[period.orderId]) {
+                enrollmentMap[period.orderId] = enrollment;
+            }
+        }
+    }
+    return queries.map((q) => enrollmentMap[q.orderId] ?? null);
+});

package/lib/loaders/index.d.ts

@@ -166,6 +166,31 @@ declare const loaders: (unchainedAPI: UnchainedCore) => {
     }, import("@unchainedshop/core-orders").Order, {
         orderId: string;
     }>;
+    orderPaymentLoader: import("dataloader")<{
+        orderPaymentId: string;
+    }, import("@unchainedshop/core-orders").OrderPayment | null, {
+        orderPaymentId: string;
+    }>;
+    orderDeliveryLoader: import("dataloader")<{
+        orderDeliveryId: string;
+    }, import("@unchainedshop/core-orders").OrderDelivery | null, {
+        orderDeliveryId: string;
+    }>;
+    orderPositionsLoader: import("dataloader")<{
+        orderId: string;
+    }, import("@unchainedshop/core-orders").OrderPosition[], {
+        orderId: string;
+    }>;
+    orderDiscountsLoader: import("dataloader")<{
+        orderId: string;
+    }, import("@unchainedshop/core-orders").OrderDiscount[], {
+        orderId: string;
+    }>;
+    enrollmentByOrderLoader: import("dataloader")<{
+        orderId: string;
+    }, import("@unchainedshop/core-enrollments").Enrollment | null, {
+        orderId: string;
+    }>;
     quotationLoader: import("dataloader")<{
         quotationId: string;
     }, import("@unchainedshop/core-quotations").Quotation | null, {

package/lib/loaders/index.js

@@ -26,6 +26,11 @@ import deliveryProviderLoader from "./deliveryProviderLoader.js";
 import paymentProviderLoader from "./paymentProviderLoader.js";
 import warehousingProviderLoader from "./warehousingProviderLoader.js";
 import orderLoader from "./orderLoader.js";
+import orderPaymentLoader from "./orderPaymentLoader.js";
+import orderDeliveryLoader from "./orderDeliveryLoader.js";
+import orderPositionsLoader from "./orderPositionsLoader.js";
+import orderDiscountsLoader from "./orderDiscountsLoader.js";
+import enrollmentByOrderLoader from "./enrollmentByOrderLoader.js";
 import quotationLoader from "./quotationLoader.js";
 import tokenExportStatusLoader from "./tokenExportStatusLoader.js";
 const loaders = (unchainedAPI) => {
@@ -58,6 +63,11 @@ const loaders = (unchainedAPI) => {
         paymentProviderLoader: paymentProviderLoader(unchainedAPI),
         warehousingProviderLoader: warehousingProviderLoader(unchainedAPI),
         orderLoader: orderLoader(unchainedAPI),
+        orderPaymentLoader: orderPaymentLoader(unchainedAPI),
+        orderDeliveryLoader: orderDeliveryLoader(unchainedAPI),
+        orderPositionsLoader: orderPositionsLoader(unchainedAPI),
+        orderDiscountsLoader: orderDiscountsLoader(unchainedAPI),
+        enrollmentByOrderLoader: enrollmentByOrderLoader(unchainedAPI),
         quotationLoader: quotationLoader(unchainedAPI),
         tokenExportStatusLoader: tokenExportStatusLoader(unchainedAPI),
     };

package/lib/loaders/orderDeliveryLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderDelivery } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderDeliveryId: string;
+}, OrderDelivery | null, {
+    orderDeliveryId: string;
+}>;
+export default _default;

package/lib/loaders/orderDeliveryLoader.js

@@ -0,0 +1,12 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderDeliveryIds = [...new Set(queries.map((q) => q.orderDeliveryId).filter(Boolean))];
+    const deliveries = await unchainedAPI.modules.orders.deliveries.findDeliveries({
+        orderDeliveryIds,
+    });
+    const deliveryMap = {};
+    for (const delivery of deliveries) {
+        deliveryMap[delivery._id] = delivery;
+    }
+    return queries.map((q) => deliveryMap[q.orderDeliveryId] ?? null);
+});

package/lib/loaders/orderDiscountsLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderDiscount } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, OrderDiscount[], {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/orderDiscountsLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
+        orderIds,
+    });
+    const discountsMap = {};
+    for (const discount of discounts) {
+        if (!discountsMap[discount.orderId]) {
+            discountsMap[discount.orderId] = [discount];
+        }
+        else {
+            discountsMap[discount.orderId].push(discount);
+        }
+    }
+    return queries.map((q) => discountsMap[q.orderId] || []);
+});

package/lib/loaders/orderPaymentLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderPayment } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderPaymentId: string;
+}, OrderPayment | null, {
+    orderPaymentId: string;
+}>;
+export default _default;

package/lib/loaders/orderPaymentLoader.js

@@ -0,0 +1,12 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderPaymentIds = [...new Set(queries.map((q) => q.orderPaymentId).filter(Boolean))];
+    const payments = await unchainedAPI.modules.orders.payments.findOrderPayments({
+        orderPaymentIds,
+    });
+    const paymentMap = {};
+    for (const payment of payments) {
+        paymentMap[payment._id] = payment;
+    }
+    return queries.map((q) => paymentMap[q.orderPaymentId] ?? null);
+});

package/lib/loaders/orderPositionsLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderPosition } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, OrderPosition[], {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/orderPositionsLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const positions = await unchainedAPI.modules.orders.positions.findOrderPositions({
+        orderIds,
+    });
+    const positionsMap = {};
+    for (const position of positions) {
+        if (!positionsMap[position.orderId]) {
+            positionsMap[position.orderId] = [position];
+        }
+        else {
+            positionsMap[position.orderId].push(position);
+        }
+    }
+    return queries.map((q) => positionsMap[q.orderId] || []);
+});

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

@@ -305,11 +305,11 @@ declare const types: {
         supportedPaymentProviders(order: import("@unchainedshop/core-orders").Order, _: any, context: import("../../context.ts").Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
         currency(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-currencies").Currency>;
         country(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-countries").Country>;
-        discounts(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDiscount[]>;
-        delivery(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDelivery | null>;
-        enrollment(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-enrollments").Enrollment | null>;
-        items(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPosition[]>;
-        payment(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPayment | null>;
+        discounts(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDiscount[]>;
+        delivery(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDelivery | null>;
+        enrollment(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-enrollments").Enrollment | null>;
+        items(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPosition[]>;
+        payment(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPayment | null>;
         status(order: import("@unchainedshop/core-orders").Order): string;
         total(order: import("@unchainedshop/core-orders").Order, params: {
             category: string;

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

@@ -11,11 +11,11 @@ export declare const Order: {
     supportedPaymentProviders(order: OrderType, _: any, context: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
     currency(order: OrderType, _: any, { loaders }: Context): Promise<Currency>;
     country(order: OrderType, _: any, { loaders }: Context): Promise<Country>;
-    discounts(order: OrderType, _: any, { modules }: Context): Promise<OrderDiscount[]>;
-    delivery(order: OrderType, _: any, { modules }: Context): Promise<OrderDelivery | null>;
-    enrollment(order: OrderType, _: any, { modules }: Context): Promise<Enrollment | null>;
-    items(order: OrderType, _: any, { modules }: Context): Promise<OrderPosition[]>;
-    payment(order: OrderType, _: any, { modules }: Context): Promise<OrderPayment | null>;
+    discounts(order: OrderType, _: any, { loaders }: Context): Promise<OrderDiscount[]>;
+    delivery(order: OrderType, _: any, { loaders }: Context): Promise<OrderDelivery | null>;
+    enrollment(order: OrderType, _: any, { loaders }: Context): Promise<Enrollment | null>;
+    items(order: OrderType, _: any, { loaders }: Context): Promise<OrderPosition[]>;
+    payment(order: OrderType, _: any, { loaders }: Context): Promise<OrderPayment | null>;
     status(order: OrderType): string;
     total(order: OrderType, params: {
         category: string;

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

@@ -16,39 +16,24 @@ export const Order = {
     async country(order, _, { loaders }) {
         return loaders.countryLoader.load({ isoCode: order.countryCode });
     },
-    async discounts(order, _, { modules }) {
-        return modules.orders.discounts.findOrderDiscounts({ orderId: order._id });
+    async discounts(order, _, { loaders }) {
+        return loaders.orderDiscountsLoader.load({ orderId: order._id });
     },
-    async delivery(order, _, { modules }) {
-        const orderDelivery = order.deliveryId &&
-            (await modules.orders.deliveries.findDelivery({
-                orderDeliveryId: order.deliveryId,
-            }));
-        if (!orderDelivery)
+    async delivery(order, _, { loaders }) {
+        if (!order.deliveryId)
             return null;
-        return orderDelivery;
+        return loaders.orderDeliveryLoader.load({ orderDeliveryId: order.deliveryId });
     },
-    async enrollment(order, _, { modules }) {
-        const enrollment = await modules.enrollments.findEnrollment({
-            orderId: order._id,
-        });
-        if (!enrollment)
-            return null;
-        return enrollment;
+    async enrollment(order, _, { loaders }) {
+        return loaders.enrollmentByOrderLoader.load({ orderId: order._id });
     },
-    async items(order, _, { modules }) {
-        return modules.orders.positions.findOrderPositions({
-            orderId: order._id,
-        });
+    async items(order, _, { loaders }) {
+        return loaders.orderPositionsLoader.load({ orderId: order._id });
     },
-    async payment(order, _, { modules }) {
-        const payment = order.paymentId &&
-            (await modules.orders.payments.findOrderPayment({
-                orderPaymentId: order.paymentId,
-            }));
-        if (!payment)
+    async payment(order, _, { loaders }) {
+        if (!order.paymentId)
             return null;
-        return payment;
+        return loaders.orderPaymentLoader.load({ orderPaymentId: order.paymentId });
     },
     status(order) {
         if (order.status === null) {

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

@@ -20,7 +20,7 @@ export interface PushSubscription {
 }
 export interface Web3Address {
     address: string;
-    nonce?: number;
+    nonce?: string;
     verified: boolean;
 }
 export interface WebAuthnCredentials {

package/lib/schema/types/user.js

@@ -82,7 +82,7 @@ export default [
 
     type Web3Address {
       address: String!
-      nonce: Int
+      nonce: String
       verified: Boolean!
     }
 

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.10",
+  "version": "4.8.12",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -62,7 +62,7 @@
   "peerDependencies": {
     "@ai-sdk/mcp": "^1",
     "@fastify/cookie": ">= 11 < 12",
-    "@fastify/multipart": ">= 9 < 10",
+    "@fastify/multipart": ">= 9 < 11",
     "@fastify/session": ">= 11 < 12",
     "@fastify/static": ">= 9 < 10",
     "@modelcontextprotocol/sdk": ">= 1 < 2",
@@ -131,7 +131,7 @@
   "devDependencies": {
     "@ai-sdk/mcp": "^1.0.5",
     "@fastify/cookie": "^11.0.2",
-    "@fastify/multipart": "^9.0.3",
+    "@fastify/multipart": "^10.0.0",
     "@fastify/session": "^11.1.0",
     "@fastify/static": "^9.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",