@unchainedshop/core 5.0.0-alpha.5 → 5.0.0-alpha.8

package/lib/directors/WorkerDirector.js

@@ -1,22 +1,10 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { WorkerAdapter } from "./WorkerAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
 const AutoScheduleMap = new Map();
-const baseDirector = BaseDirector('WorkerDirector', {
-    adapterKeyField: 'key',
-});
 export const WorkerDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(WorkerAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(WorkerAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(WorkerAdapter.adapterType),
     getActivePluginTypes: ({ external } = {}) => {
         return WorkerDirector.getAdapters()
             .filter((adapter) => {

package/lib/directors/registryDirector.d.ts

@@ -0,0 +1,2 @@
+import type { IBaseAdapter, IBaseDirector } from '@unchainedshop/utils';
+export declare const registryDirector: <Adapter extends IBaseAdapter>(adapterType: symbol) => IBaseDirector<Adapter>;

package/lib/directors/registryDirector.js

@@ -0,0 +1,6 @@
+import { pluginRegistry } from "../plugins/PluginRegistry.js";
+export const registryDirector = (adapterType) => ({
+    getAdapter: (key) => pluginRegistry.getAdapters(adapterType).find((adapter) => adapter.key === key) ||
+        null,
+    getAdapters: ({ adapterFilter } = {}) => pluginRegistry.getAdapters(adapterType).filter(adapterFilter || (() => true)),
+});

package/lib/factory/registerVirtualWarehousing.js

@@ -5,7 +5,7 @@ export default function registerVirtualWarehousing({ adapterId, orderIndex = 0,
     const adapter = {
         ...WarehousingAdapter,
         key: 'shop.unchained.warehousing.virtual.' + adapterId,
-        label: 'Virtual Wareshousing: ' + adapterId,
+        label: 'Virtual Warehousing: ' + adapterId,
         version: '1.0.0',
         orderIndex,
         initialConfiguration: [{ key: 'shipping-hub', value: 'Shipping Hub' }],

package/lib/plugins/PluginRegistry.d.ts

@@ -35,6 +35,7 @@ declare class PluginRegistry {
     getPlugin(key: string): IPlugin | undefined;
     getAllPlugins(): IPlugin[];
     getAdapters(adapterType: symbol): IBaseAdapter[];
+    getAllAdapters(): IBaseAdapter[];
     hasPlugin(key: string): boolean;
     clear(): void;
 }

package/lib/plugins/PluginRegistry.js

@@ -5,9 +5,11 @@ class PluginRegistry {
     moduleFactories = [];
     skippedPlugins = new Set();
     register(plugin) {
-        if (this.plugins.has(plugin.key)) {
+        const registered = this.plugins.get(plugin.key);
+        if (registered) {
             logger.warn(`Plugin ${plugin.key} already registered, skipping`, {
                 label: plugin.label,
+                registeredLabel: registered.label,
             });
             return;
         }
@@ -103,6 +105,11 @@ class PluginRegistry {
         }
         return result.toSorted((left, right) => (left.orderIndex ?? 0) - (right.orderIndex ?? 0));
     }
+    getAllAdapters() {
+        return this.getAllPlugins()
+            .filter((plugin) => !this.skippedPlugins.has(plugin.key))
+            .flatMap((plugin) => plugin.adapters ?? []);
+    }
     hasPlugin(key) {
         return this.plugins.has(key);
     }

package/lib/services/checkoutOrder.js

@@ -2,6 +2,7 @@ import { OrderStatus } from '@unchainedshop/core-orders';
 import { nextUserCartService } from "./nextUserCart.js";
 import { validateOrderService } from "./validateOrder.js";
 import { processOrderService } from "./processOrder.js";
+import { reserveOrderDiscountsForCheckout } from "./reserveOrderDiscountsForCheckout.js";
 export async function checkoutOrderService(orderId, transactionContext) {
     const order = await this.orders.findOrder({ orderId });
     if (!order)
@@ -10,7 +11,9 @@ export async function checkoutOrderService(orderId, transactionContext) {
         return order;
     await validateOrderService.bind(this)(order);
     const lock = await this.orders.acquireLock(order._id, 'checkout');
+    let discounts;
     try {
+        discounts = await reserveOrderDiscountsForCheckout.call(this, order);
         const processedOrder = await processOrderService.bind(this)(order, transactionContext);
         if (processedOrder.billingAddress) {
             await this.users.updateLastBillingAddress(processedOrder.userId, processedOrder.billingAddress);
@@ -27,6 +30,7 @@ export async function checkoutOrderService(orderId, transactionContext) {
         return processedOrder;
     }
     finally {
+        await discounts?.release();
         await lock.release();
     }
 }

package/lib/services/index.d.ts

@@ -24,6 +24,7 @@ import { searchProductsService } from './searchProducts.ts';
 import { calculateDiscountTotalService } from './calculateDiscountTotal.ts';
 import { registerPaymentCredentialsService } from './registerPaymentCredentials.ts';
 import { processOrderService } from './processOrder.ts';
+import { processEnrollmentService } from './processEnrollment.ts';
 import { checkoutOrderService } from './checkoutOrder.ts';
 import { confirmOrderService } from './confirmOrder.ts';
 import { rejectOrderService } from './rejectOrder.ts';
@@ -126,7 +127,7 @@ export default function initServices(modules: Modules, customServices?: CustomSe
     enrollments: {
         createEnrollmentFromCheckout: Bound<typeof createEnrollmentFromCheckoutService>;
         generateOrderFromEnrollment: Bound<typeof generateOrderFromEnrollmentService>;
-        processEnrollment: Bound<typeof processOrderService>;
+        processEnrollment: Bound<typeof processEnrollmentService>;
         initializeEnrollment: Bound<typeof initializeEnrollmentService>;
         activateEnrollment: Bound<typeof activateEnrollmentService>;
         terminateEnrollment: Bound<typeof terminateEnrollmentService>;

package/lib/services/index.js

@@ -23,6 +23,7 @@ import { searchProductsService } from "./searchProducts.js";
 import { calculateDiscountTotalService } from "./calculateDiscountTotal.js";
 import { registerPaymentCredentialsService } from "./registerPaymentCredentials.js";
 import { processOrderService } from "./processOrder.js";
+import { processEnrollmentService } from "./processEnrollment.js";
 import { checkoutOrderService } from "./checkoutOrder.js";
 import { confirmOrderService } from "./confirmOrder.js";
 import { rejectOrderService } from "./rejectOrder.js";
@@ -137,7 +138,7 @@ export default function initServices(modules, customServices = {}) {
         enrollments: {
             createEnrollmentFromCheckout: createEnrollmentFromCheckoutService,
             generateOrderFromEnrollment: generateOrderFromEnrollmentService,
-            processEnrollment: processOrderService,
+            processEnrollment: processEnrollmentService,
             initializeEnrollment: initializeEnrollmentService,
             activateEnrollment: activateEnrollmentService,
             terminateEnrollment: terminateEnrollmentService,

package/lib/services/reserveOrderDiscountsForCheckout.d.ts

@@ -0,0 +1,5 @@
+import type { Order } from '@unchainedshop/core-orders';
+import type { Modules } from '../modules.ts';
+export declare function reserveOrderDiscountsForCheckout(this: Modules, order: Order): Promise<{
+    release: () => Promise<void>;
+}>;

package/lib/services/reserveOrderDiscountsForCheckout.js

@@ -0,0 +1,34 @@
+import { createLogger } from '@unchainedshop/logger';
+import { OrderDiscountDirector } from "../directors/OrderDiscountDirector.js";
+const logger = createLogger('unchained:core:checkoutOrder');
+export async function reserveOrderDiscountsForCheckout(order) {
+    const reservations = [];
+    const release = async () => {
+        const results = await Promise.allSettled(reservations.map((reservation) => reservation.release()));
+        for (const result of results) {
+            if (result.status === 'rejected') {
+                logger.error(`Could not release a discount reservation of order ${order._id}`, {
+                    error: result.reason,
+                });
+            }
+        }
+    };
+    try {
+        const discounts = await this.orders.discounts.findOrderDiscounts({ orderId: order._id });
+        for (const orderDiscount of discounts) {
+            const Adapter = OrderDiscountDirector.getAdapter(orderDiscount.discountKey);
+            if (!Adapter)
+                continue;
+            const adapter = await Adapter.actions({
+                context: { order, orderDiscount, code: orderDiscount.code, modules: this },
+            });
+            if (adapter.reserveForCheckout)
+                reservations.push(await adapter.reserveForCheckout());
+        }
+        return { release };
+    }
+    catch (error) {
+        await release();
+        throw error;
+    }
+}

package/lib/services/simulateProductDispatching.d.ts

@@ -3,10 +3,12 @@ import type { Product } from '@unchainedshop/core-products';
 import { type EstimatedDispatch } from '../directors/WarehousingDirector.ts';
 import type { WarehousingContext } from '../directors/WarehousingAdapter.ts';
 import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare function simulateProductDispatchingService(this: Modules, { product, quantity, referenceDate, }: {
+import type { DeliveryProviderType } from '@unchainedshop/core-delivery';
+export declare function simulateProductDispatchingService(this: Modules, { product, quantity, referenceDate, deliveryProviderType, }: {
     product: Product;
     quantity: number;
     referenceDate?: Date;
+    deliveryProviderType?: DeliveryProviderType | null;
 }): Promise<(WarehousingContext & EstimatedDispatch & {
     warehousingProvider: WarehousingProvider;
 })[]>;

package/lib/services/simulateProductDispatching.js

@@ -1,7 +1,7 @@
 import { supportedWarehousingProvidersService } from "./supportedWarehousingProviders.js";
 import { WarehousingDirector } from "../directors/WarehousingDirector.js";
-export async function simulateProductDispatchingService({ product, quantity, referenceDate, }) {
-    const deliveryProviders = await this.delivery.allProviders();
+export async function simulateProductDispatchingService({ product, quantity, referenceDate, deliveryProviderType, }) {
+    const deliveryProviders = (await this.delivery.allProviders()).filter(({ type }) => !deliveryProviderType || type === deliveryProviderType);
     return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
         const result = await oldResult;
         const warehousingProviders = await supportedWarehousingProvidersService.bind(this)({
@@ -25,6 +25,6 @@ export async function simulateProductDispatchingService({ product, quantity, ref
                 ...dispatch,
             };
         }));
-        return result.concat(result, mappedWarehousingProviders);
+        return result.concat(mappedWarehousingProviders);
     }, Promise.resolve([]));
 }

package/lib/services/simulateProductInventory.d.ts

@@ -2,9 +2,11 @@ import type { Modules } from '../modules.ts';
 import type { Product } from '@unchainedshop/core-products';
 import type { WarehousingContext } from '../directors/WarehousingAdapter.ts';
 import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare function simulateProductInventoryService(this: Modules, { product, referenceDate, }: {
+import type { DeliveryProviderType } from '@unchainedshop/core-delivery';
+export declare function simulateProductInventoryService(this: Modules, { product, referenceDate, deliveryProviderType, }: {
     product: Product;
     referenceDate?: Date;
+    deliveryProviderType?: DeliveryProviderType | null;
 }): Promise<(WarehousingContext & {
     quantity?: number;
 } & {

package/lib/services/simulateProductInventory.js

@@ -1,7 +1,7 @@
 import { supportedWarehousingProvidersService } from "./supportedWarehousingProviders.js";
 import { WarehousingDirector } from "../directors/WarehousingDirector.js";
-export async function simulateProductInventoryService({ product, referenceDate, }) {
-    const deliveryProviders = await this.delivery.allProviders();
+export async function simulateProductInventoryService({ product, referenceDate, deliveryProviderType, }) {
+    const deliveryProviders = (await this.delivery.allProviders()).filter(({ type }) => !deliveryProviderType || type === deliveryProviderType);
     return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
         const result = await oldResult;
         const warehousingProviders = await supportedWarehousingProvidersService.bind(this)({
@@ -24,6 +24,6 @@ export async function simulateProductInventoryService({ product, referenceDate,
                 ...stock,
             };
         }));
-        return result.concat(result, mappedWarehousingProviders);
+        return result.concat(mappedWarehousingProviders);
     }, Promise.resolve([]));
 }

package/lib/services/supportedDeliveryProviders.js

@@ -1,8 +1,17 @@
 import { deliverySettings } from '@unchainedshop/core-delivery';
+import { createLogger } from '@unchainedshop/logger';
 import { DeliveryDirector } from "../directors/index.js";
+const logger = createLogger('unchained:core');
 export async function supportedDeliveryProvidersService(params) {
     const allProviders = await this.delivery.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!DeliveryDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Delivery provider skipped, its adapter is not registered', {
+                deliveryProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await DeliveryDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/lib/services/supportedPaymentProviders.js

@@ -1,8 +1,17 @@
 import { paymentSettings } from '@unchainedshop/core-payment';
+import { createLogger } from '@unchainedshop/logger';
 import { PaymentDirector } from "../directors/PaymentDirector.js";
+const logger = createLogger('unchained:core');
 export async function supportedPaymentProvidersService(params) {
     const allProviders = await this.payment.paymentProviders.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!PaymentDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Payment provider skipped, its adapter is not registered', {
+                paymentProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await PaymentDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/lib/services/supportedWarehousingProviders.js

@@ -1,7 +1,16 @@
+import { createLogger } from '@unchainedshop/logger';
 import { WarehousingDirector } from "../directors/index.js";
+const logger = createLogger('unchained:core');
 export async function supportedWarehousingProvidersService(params) {
     const allProviders = await this.warehousing.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!WarehousingDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Warehousing provider skipped, its adapter is not registered', {
+                warehousingProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await WarehousingDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core",
   "description": "Core orchestration package for the Unchained Engine with business services and directors",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.8",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",
@@ -35,27 +35,27 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/core-assortments": "^5.0.0-alpha.5",
-    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.5",
-    "@unchainedshop/core-countries": "^5.0.0-alpha.5",
-    "@unchainedshop/core-currencies": "^5.0.0-alpha.5",
-    "@unchainedshop/core-delivery": "^5.0.0-alpha.5",
-    "@unchainedshop/core-enrollments": "^5.0.0-alpha.5",
-    "@unchainedshop/core-events": "^5.0.0-alpha.5",
-    "@unchainedshop/core-files": "^5.0.0-alpha.5",
-    "@unchainedshop/core-filters": "^5.0.0-alpha.5",
-    "@unchainedshop/core-languages": "^5.0.0-alpha.5",
-    "@unchainedshop/core-orders": "^5.0.0-alpha.5",
-    "@unchainedshop/core-payment": "^5.0.0-alpha.5",
-    "@unchainedshop/core-products": "^5.0.0-alpha.5",
-    "@unchainedshop/core-quotations": "^5.0.0-alpha.5",
-    "@unchainedshop/core-users": "^5.0.0-alpha.5",
-    "@unchainedshop/core-warehousing": "^5.0.0-alpha.5",
-    "@unchainedshop/core-worker": "^5.0.0-alpha.5",
-    "@unchainedshop/events": "^5.0.0-alpha.5",
-    "@unchainedshop/logger": "^5.0.0-alpha.5",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.5",
-    "@unchainedshop/utils": "^5.0.0-alpha.5",
+    "@unchainedshop/core-assortments": "^5.0.0-alpha.8",
+    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.8",
+    "@unchainedshop/core-countries": "^5.0.0-alpha.8",
+    "@unchainedshop/core-currencies": "^5.0.0-alpha.8",
+    "@unchainedshop/core-delivery": "^5.0.0-alpha.8",
+    "@unchainedshop/core-enrollments": "^5.0.0-alpha.8",
+    "@unchainedshop/core-events": "^5.0.0-alpha.8",
+    "@unchainedshop/core-files": "^5.0.0-alpha.8",
+    "@unchainedshop/core-filters": "^5.0.0-alpha.8",
+    "@unchainedshop/core-languages": "^5.0.0-alpha.8",
+    "@unchainedshop/core-orders": "^5.0.0-alpha.8",
+    "@unchainedshop/core-payment": "^5.0.0-alpha.8",
+    "@unchainedshop/core-products": "^5.0.0-alpha.8",
+    "@unchainedshop/core-quotations": "^5.0.0-alpha.8",
+    "@unchainedshop/core-users": "^5.0.0-alpha.8",
+    "@unchainedshop/core-warehousing": "^5.0.0-alpha.8",
+    "@unchainedshop/core-worker": "^5.0.0-alpha.8",
+    "@unchainedshop/events": "^5.0.0-alpha.8",
+    "@unchainedshop/logger": "^5.0.0-alpha.8",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.8",
+    "@unchainedshop/utils": "^5.0.0-alpha.8",
     "minipass-json-stream": "^1.0.2",
     "zod": "^4.2.0"
   },