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

package/lib/directors/BaseDiscountDirector.js

@@ -1,19 +1,17 @@
-import { BaseDirector } from '@unchainedshop/utils';
-export const BaseDiscountDirector = (directorName) => {
-    const baseDirector = BaseDirector(directorName, {
-        adapterSortKey: 'orderIndex',
-    });
+import { registryDirector } from "./registryDirector.js";
+export const BaseDiscountDirector = (adapterType) => {
     const director = {
-        ...baseDirector,
+        ...registryDirector(adapterType),
         actions: async function (discountContext, unchainedAPI) {
             const context = { ...discountContext, ...unchainedAPI };
             return {
                 resolveDiscountAdapterFromStaticCode: async (options) => {
                     if (!context.order)
                         return null;
-                    const discounts = await Promise.all(this.getAdapters()
-                        .filter((Adapter) => Adapter.isManualAdditionAllowed(options?.code))
-                        .map(async (Adapter) => {
+                    const discounts = await Promise.all(this.getAdapters().map(async (Adapter) => {
+                        if (!(await Adapter.isManualAdditionAllowed(options?.code))) {
+                            return { Adapter, isValid: false };
+                        }
                         const adapter = await Adapter.actions({ context });
                         return {
                             Adapter,

package/lib/directors/BasePricingDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector, type PricingCalculation } from '@unchainedshop/utils';
+import type { IBaseDirector, PricingCalculation } from '@unchainedshop/utils';
 import type { BasePricingAdapterContext, BasePricingContext, IPricingAdapter } from './BasePricingAdapter.ts';
 import type { IPricingSheet } from './BasePricingSheet.ts';
 import type { Modules } from '../modules.ts';
@@ -13,4 +13,4 @@ export type IPricingDirector<PricingContext extends BasePricingContext, Calculat
     rebuildCalculation: (pricingContext: PricingContext, unchainedAPI: Context) => Promise<Calculation[]>;
     calculationSheet: (pricingContext: PricingContext, calculation: Calculation[]) => PricingAdapterSheet;
 };
-export declare const BasePricingDirector: <DirectorContext extends BasePricingContext, AdapterContext extends BasePricingAdapterContext, Calculation extends PricingCalculation, PricingAdapter extends IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>>(directorName: string) => IPricingDirector<DirectorContext, Calculation, AdapterContext, IPricingSheet<Calculation>, PricingAdapter>;
+export declare const BasePricingDirector: <DirectorContext extends BasePricingContext, AdapterContext extends BasePricingAdapterContext, Calculation extends PricingCalculation, PricingAdapter extends IPricingAdapter<AdapterContext, Calculation, IPricingSheet<Calculation>>>(adapterType: symbol) => IPricingDirector<DirectorContext, Calculation, AdapterContext, IPricingSheet<Calculation>, PricingAdapter>;

package/lib/directors/BasePricingDirector.js

@@ -1,13 +1,10 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { OrderDiscountDirector } from "./OrderDiscountDirector.js";
+import { registryDirector } from "./registryDirector.js";
 import { createLogger } from '@unchainedshop/logger';
 const logger = createLogger('unchained:core');
-export const BasePricingDirector = (directorName) => {
-    const baseDirector = BaseDirector(directorName, {
-        adapterSortKey: 'orderIndex',
-    });
+export const BasePricingDirector = (adapterType) => {
     const director = {
-        ...baseDirector,
+        ...registryDirector(adapterType),
         buildPricingContext: async () => {
             throw new Error('Method not implemented');
         },

package/lib/directors/DeliveryDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import { type DeliveryAdapterActions, type DeliveryContext, type IDeliveryAdapter } from './DeliveryAdapter.ts';
 import type { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { type Order } from '@unchainedshop/core-orders';

package/lib/directors/DeliveryDirector.js

@@ -1,20 +1,10 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { DeliveryError, DeliveryAdapter, } from "./DeliveryAdapter.js";
 import { OrderDeliveryStatus } from '@unchainedshop/core-orders';
 import { createLogger } from '@unchainedshop/logger';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
-const baseDirector = BaseDirector('DeliveryDirector');
 export const DeliveryDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(DeliveryAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(DeliveryAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(DeliveryAdapter.adapterType),
     actions: async (deliveryProvider, deliveryContext, unchainedAPI) => {
         const Adapter = DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
         if (!Adapter) {

package/lib/directors/DeliveryPricingDirector.js

@@ -1,18 +1,9 @@
 import { DeliveryPricingSheet } from "./DeliveryPricingSheet.js";
 import { BasePricingDirector } from "./BasePricingDirector.js";
 import { DeliveryPricingAdapter, } from "./DeliveryPricingAdapter.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BasePricingDirector('DeliveryPricingDirector');
+const baseDirector = BasePricingDirector(DeliveryPricingAdapter.adapterType);
 export const DeliveryPricingDirector = {
     ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(DeliveryPricingAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(DeliveryPricingAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
     async buildPricingContext(context, unchainedAPI) {
         const { modules } = unchainedAPI;
         if ('item' in context) {

package/lib/directors/EnrollmentAdapter.js

@@ -24,7 +24,6 @@ export const EnrollmentAdapter = {
     },
     transformOrderItemToEnrollmentPlan: async (item) => {
         return {
-            configuration: item.configuration,
             productId: item.productId,
             quantity: item.quantity,
         };

package/lib/directors/EnrollmentDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import type { EnrollmentAdapterActions, EnrollmentContext, IEnrollmentAdapter } from './EnrollmentAdapter.ts';
 import type { OrderPosition } from '@unchainedshop/core-orders';
 import type { Product } from '@unchainedshop/core-products';

package/lib/directors/EnrollmentDirector.js

@@ -1,11 +1,7 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { EnrollmentAdapter } from "./EnrollmentAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
-const baseDirector = BaseDirector('EnrollmentDirector', {
-    adapterSortKey: 'orderIndex',
-});
 const findAppropriateAdapters = (productPlan) => EnrollmentDirector.getAdapters({
     adapterFilter: (Adapter) => {
         const activated = Adapter.isActivatedFor(productPlan);
@@ -16,15 +12,7 @@ const findAppropriateAdapters = (productPlan) => EnrollmentDirector.getAdapters(
     },
 });
 export const EnrollmentDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(EnrollmentAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(EnrollmentAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(EnrollmentAdapter.adapterType),
     transformOrderItemToEnrollment: async ({ orderPosition, product }, doc, unchainedAPI) => {
         const Adapter = findAppropriateAdapters(product.plan)?.[0];
         if (!Adapter) {
@@ -34,7 +22,7 @@ export const EnrollmentDirector = {
         return {
             ...doc,
             ...enrollmentPlan,
-            configuration: [],
+            configuration: enrollmentPlan.configuration ?? [],
         };
     },
     actions: async (enrollmentContext, unchainedAPI) => {

package/lib/directors/FileDirector.d.ts

@@ -1,10 +1,10 @@
 import type { IFileAdapter, UploadedFile } from '@unchainedshop/core-files';
 export type UploadFileCallback<UnchainedAPI = unknown> = (file: UploadedFile, unchainedAPI: UnchainedAPI) => Promise<void>;
 export declare const FileDirector: {
-    getAdapter: (key: string) => IFileAdapter<unknown> | null;
-    getAdapters: (options?: {
-        adapterFilter?: (adapter: IFileAdapter) => boolean;
-    }) => IFileAdapter<unknown>[];
     registerFileUploadCallback<UnchainedAPI>(directoryName: string, fn: UploadFileCallback<UnchainedAPI>): void;
     getFileUploadCallback(directoryName: string): UploadFileCallback<unknown> | null;
+    getAdapters: (options?: {
+        adapterFilter?: ((adapter: IFileAdapter<unknown>) => boolean) | undefined;
+    } | undefined) => IFileAdapter<unknown>[];
+    getAdapter: (key: string) => IFileAdapter<unknown> | null;
 };

package/lib/directors/FileDirector.js

@@ -1,19 +1,8 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { FileAdapter } from '@unchainedshop/core-files';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const FileUploadRegistry = new Map();
-const baseDirector = BaseDirector('FileDirector');
 export const FileDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(FileAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: (options) => {
-        const { adapterFilter } = options || {};
-        const adapters = pluginRegistry.getAdapters(FileAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(FileAdapter.adapterType),
     registerFileUploadCallback(directoryName, fn) {
         if (!FileUploadRegistry.has(directoryName)) {
             FileUploadRegistry.set(directoryName, fn);

package/lib/directors/FilterDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import type { FilterAdapterActions, FilterContext, IFilterAdapter } from './FilterAdapter.ts';
 import { type Filter, type SearchConfiguration, type SearchFilterQuery, type SearchQuery } from '@unchainedshop/core-filters';
 import type { Modules } from '../modules.ts';

package/lib/directors/FilterDirector.js

@@ -1,25 +1,13 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { BaseDirector } from '@unchainedshop/utils';
 import { filterCacheGeneration, filtersSettings, FilterType, } from '@unchainedshop/core-filters';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 import { FilterAdapter } from "./FilterAdapter.js";
 export const parseQueryArray = (query) => (query || []).reduce((accumulator, { key, value }) => ({
     ...accumulator,
     [key]: accumulator[key] ? accumulator[key].concat(value) : [value],
 }), {});
-const baseDirector = BaseDirector('FilterDirector', {
-    adapterSortKey: 'orderIndex',
-});
 export const FilterDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(FilterAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(FilterAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(FilterAdapter.adapterType),
     actions: async (filterContext, unchainedAPI) => {
         const context = { ...filterContext, ...unchainedAPI };
         const adapters = FilterDirector.getAdapters().map((Adapter) => Adapter.actions(context));

package/lib/directors/OrderDiscountDirector.d.ts

@@ -1,16 +1,2 @@
-import type { IDiscountAdapter } from './BaseDiscountAdapter.ts';
 import type { OrderDiscountConfiguration } from './OrderDiscountConfiguration.ts';
-export declare const OrderDiscountDirector: {
-    getAdapter: (key: string) => IDiscountAdapter<OrderDiscountConfiguration> | null;
-    getAdapters: (options?: {
-        adapterFilter?: (adapter: any) => boolean;
-    }) => IDiscountAdapter<OrderDiscountConfiguration>[];
-    actions: (discountContext: import("./BaseDiscountAdapter.ts").DiscountContext, unchainedAPI: {
-        modules: import("../modules.ts").Modules;
-    }) => Promise<{
-        resolveDiscountAdapterFromStaticCode: (params: {
-            code: string;
-        }) => Promise<IDiscountAdapter<OrderDiscountConfiguration> | null>;
-        findSystemDiscounts: () => Promise<string[]>;
-    }>;
-};
+export declare const OrderDiscountDirector: import("./BaseDiscountDirector.ts").IDiscountDirector<OrderDiscountConfiguration>;

package/lib/directors/OrderDiscountDirector.js

@@ -1,15 +1,3 @@
 import { BaseDiscountDirector } from "./BaseDiscountDirector.js";
 import { OrderDiscountAdapter } from "./OrderDiscountAdapter.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BaseDiscountDirector('OrderDiscountDirector');
-export const OrderDiscountDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(OrderDiscountAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: (options) => {
-        const adapters = pluginRegistry.getAdapters(OrderDiscountAdapter.adapterType);
-        return adapters.filter(options?.adapterFilter || (() => true));
-    },
-};
+export const OrderDiscountDirector = BaseDiscountDirector(OrderDiscountAdapter.adapterType);

package/lib/directors/OrderPricingDirector.js

@@ -1,18 +1,9 @@
 import { OrderPricingSheet, } from "./OrderPricingSheet.js";
 import { OrderPricingAdapter, } from "./OrderPricingAdapter.js";
 import { BasePricingDirector } from "./BasePricingDirector.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BasePricingDirector('OrderPricingDirector');
+const baseDirector = BasePricingDirector(OrderPricingAdapter.adapterType);
 export const OrderPricingDirector = {
     ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(OrderPricingAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(OrderPricingAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
     buildPricingContext: async (context, unchainedAPI) => {
         const { modules } = unchainedAPI;
         const { order, currencyCode } = context;

package/lib/directors/OrderPricingSheet.d.ts

@@ -33,5 +33,6 @@ export interface IOrderPricingSheet extends IPricingSheet<OrderPricingCalculatio
         taxAmount: number;
         meta?: any;
     }) => void;
+    discountSum: (discountId?: string) => number;
 }
 export declare const OrderPricingSheet: (params: PricingSheetParams<OrderPricingCalculation>) => IOrderPricingSheet;

package/lib/directors/OrderPricingSheet.js

@@ -15,6 +15,7 @@ export const OrderPricingSheet = (params) => {
                 amount: taxAmount,
                 baseCategory: category,
                 discountId,
+                isNetPrice: false,
                 meta,
             });
         }
@@ -25,6 +26,7 @@ export const OrderPricingSheet = (params) => {
             basePricingSheet.calculation.push({
                 category: OrderPricingRowCategory.Items,
                 amount,
+                isNetPrice: true,
                 meta,
             });
             addTaxIfAvailabile(OrderPricingRowCategory.Items, taxAmount, meta);
@@ -34,6 +36,7 @@ export const OrderPricingSheet = (params) => {
                 category: OrderPricingRowCategory.Discounts,
                 amount,
                 discountId,
+                isNetPrice: true,
                 meta,
             });
             addTaxIfAvailabile(OrderPricingRowCategory.Discounts, taxAmount, meta, discountId);
@@ -42,6 +45,7 @@ export const OrderPricingSheet = (params) => {
             basePricingSheet.calculation.push({
                 category: OrderPricingRowCategory.Delivery,
                 amount,
+                isNetPrice: true,
                 meta,
             });
             addTaxIfAvailabile(OrderPricingRowCategory.Delivery, taxAmount, meta);
@@ -50,6 +54,7 @@ export const OrderPricingSheet = (params) => {
             basePricingSheet.calculation.push({
                 category: OrderPricingRowCategory.Payment,
                 amount,
+                isNetPrice: true,
                 meta,
             });
             addTaxIfAvailabile(OrderPricingRowCategory.Payment, taxAmount, meta);
@@ -60,20 +65,11 @@ export const OrderPricingSheet = (params) => {
                 ...(filter || {}),
             });
         },
-        gross() {
-            return basePricingSheet.sum() - this.taxSum();
-        },
-        net() {
-            return basePricingSheet.sum() - this.taxSum() - this.taxSum();
-        },
-        total({ category, useNetPrice, discountId } = { useNetPrice: false }) {
-            const taxAmount = this.taxSum({ baseCategory: category, discountId });
-            const amount = this.sum({ category, discountId }) - taxAmount;
-            const netAmount = !category ? amount - taxAmount : amount;
-            return {
-                amount: Math.round(useNetPrice ? netAmount : netAmount + taxAmount),
-                currencyCode: this.currencyCode,
-            };
+        discountSum(discountId) {
+            return basePricingSheet.sum({
+                category: OrderPricingRowCategory.Discounts,
+                discountId,
+            });
         },
         discountPrices(explicitDiscountId) {
             const discountIds = pricingSheet
@@ -85,17 +81,21 @@ export const OrderPricingSheet = (params) => {
                 .filter(Boolean);
             return [...new Set(discountIds)]
                 .map((discountId) => {
-                const amount = basePricingSheet.sum({
+                const amount = pricingSheet.sum({
                     category: OrderPricingRowCategory.Discounts,
                     discountId,
-                });
+                }) +
+                    pricingSheet.taxSum({
+                        baseCategory: OrderPricingRowCategory.Discounts,
+                        discountId,
+                    });
                 if (!amount) {
                     return null;
                 }
                 return {
                     discountId,
                     amount: Math.round(amount),
-                    currencyCode: basePricingSheet.currencyCode,
+                    currencyCode: pricingSheet.currencyCode,
                 };
             })
                 .filter(Boolean);

package/lib/directors/PaymentDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import { type IPaymentActions, type IPaymentAdapter, type PaymentContext } from './PaymentAdapter.ts';
 import type { PaymentProvider } from '@unchainedshop/core-payment';
 import { type Order, type OrderPayment } from '@unchainedshop/core-orders';

package/lib/directors/PaymentDirector.js

@@ -1,8 +1,7 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { createLogger } from '@unchainedshop/logger';
 import { PaymentError, PaymentAdapter, } from "./PaymentAdapter.js";
 import { OrderPaymentStatus } from '@unchainedshop/core-orders';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const buildPaymentProviderActionsContext = (orderPayment, { transactionContext, ...rest }) => ({
     ...rest,
     orderPayment,
@@ -12,17 +11,8 @@ const buildPaymentProviderActionsContext = (orderPayment, { transactionContext,
     },
 });
 const logger = createLogger('unchained:core:payment');
-const baseDirector = BaseDirector('PaymentDirector');
 export const PaymentDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(PaymentAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(PaymentAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(PaymentAdapter.adapterType),
     actions: async (paymentProvider, paymentContext, unchainedAPI) => {
         const Adapter = PaymentDirector.getAdapter(paymentProvider.adapterKey);
         if (!Adapter) {

package/lib/directors/PaymentPricingDirector.js

@@ -1,18 +1,9 @@
 import { BasePricingDirector } from "./BasePricingDirector.js";
 import { PaymentPricingAdapter, } from "./PaymentPricingAdapter.js";
 import { PaymentPricingSheet } from "./PaymentPricingSheet.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BasePricingDirector('PaymentPricingDirector');
+const baseDirector = BasePricingDirector(PaymentPricingAdapter.adapterType);
 export const PaymentPricingDirector = {
     ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(PaymentPricingAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(PaymentPricingAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
     async buildPricingContext(context, unchainedAPI) {
         const { modules } = unchainedAPI;
         if ('item' in context) {

package/lib/directors/ProductDiscountDirector.d.ts

@@ -1,16 +1,2 @@
 import type { ProductDiscountConfiguration } from './ProductDiscountConfiguration.ts';
-import type { IDiscountAdapter } from './BaseDiscountAdapter.ts';
-export declare const ProductDiscountDirector: {
-    getAdapter: (key: string) => IDiscountAdapter<ProductDiscountConfiguration> | null;
-    getAdapters: (options?: {
-        adapterFilter?: (adapter: any) => boolean;
-    }) => IDiscountAdapter<ProductDiscountConfiguration>[];
-    actions: (discountContext: import("./BaseDiscountAdapter.ts").DiscountContext, unchainedAPI: {
-        modules: import("../modules.ts").Modules;
-    }) => Promise<{
-        resolveDiscountAdapterFromStaticCode: (params: {
-            code: string;
-        }) => Promise<IDiscountAdapter<ProductDiscountConfiguration> | null>;
-        findSystemDiscounts: () => Promise<string[]>;
-    }>;
-};
+export declare const ProductDiscountDirector: import("./BaseDiscountDirector.ts").IDiscountDirector<ProductDiscountConfiguration>;

package/lib/directors/ProductDiscountDirector.js

@@ -1,15 +1,3 @@
 import { BaseDiscountDirector } from "./BaseDiscountDirector.js";
 import { ProductDiscountAdapter } from "./ProductDiscountAdapter.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BaseDiscountDirector('ProductDiscountDirector');
-export const ProductDiscountDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(ProductDiscountAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: (options) => {
-        const adapters = pluginRegistry.getAdapters(ProductDiscountAdapter.adapterType);
-        return adapters.filter(options?.adapterFilter || (() => true));
-    },
-};
+export const ProductDiscountDirector = BaseDiscountDirector(ProductDiscountAdapter.adapterType);

package/lib/directors/ProductPricingDirector.js

@@ -1,18 +1,9 @@
 import { ProductPricingSheet, } from "./ProductPricingSheet.js";
 import { ProductPricingAdapter, } from "./ProductPricingAdapter.js";
 import { BasePricingDirector } from "./BasePricingDirector.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
-const baseDirector = BasePricingDirector('ProductPricingDirector');
+const baseDirector = BasePricingDirector(ProductPricingAdapter.adapterType);
 export const ProductPricingDirector = {
     ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(ProductPricingAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(ProductPricingAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
     async buildPricingContext(context, unchainedAPI) {
         const { modules } = unchainedAPI;
         const { quantity = 1, currencyCode } = context;

package/lib/directors/QuotationDirector.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import { type IQuotationAdapter, type QuotationAdapterActions, type QuotationContext } from './QuotationAdapter.ts';
 export type IQuotationDirector = IBaseDirector<IQuotationAdapter> & {
     actions: (quotationContext: QuotationContext, unchainedAPI: any) => Promise<QuotationAdapterActions>;

package/lib/directors/QuotationDirector.js

@@ -1,11 +1,7 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { QuotationError, QuotationAdapter, } from "./QuotationAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
-const baseDirector = BaseDirector('QuotationDirector', {
-    adapterSortKey: 'orderIndex',
-});
 const findAppropriateAdapters = (quotationContext, unchainedAPI) => QuotationDirector.getAdapters({
     adapterFilter: (Adapter) => {
         const activated = Adapter.isActivatedFor(quotationContext, unchainedAPI);
@@ -16,15 +12,7 @@ const findAppropriateAdapters = (quotationContext, unchainedAPI) => QuotationDir
     },
 });
 export const QuotationDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(QuotationAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(QuotationAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(QuotationAdapter.adapterType),
     actions: async (quotationContext, unchainedAPI) => {
         const context = { ...quotationContext, ...unchainedAPI };
         const Adapter = findAppropriateAdapters(quotationContext, unchainedAPI)?.shift();

package/lib/directors/WarehousingDirector.js

@@ -1,25 +1,13 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { createLogger } from '@unchainedshop/logger';
 const logger = createLogger('unchained:core');
 import { DeliveryDirector } from "./DeliveryDirector.js";
 import { WarehousingError, WarehousingAdapter, } from "./WarehousingAdapter.js";
-import { pluginRegistry } from "../plugins/PluginRegistry.js";
+import { registryDirector } from "./registryDirector.js";
 const getReferenceDate = (context) => {
     return context && context.referenceDate ? context.referenceDate : new Date();
 };
-const baseDirector = BaseDirector('WarehousingDirector', {
-    adapterSortKey: 'orderIndex',
-});
 export const WarehousingDirector = {
-    ...baseDirector,
-    getAdapter: (key) => {
-        const adapters = pluginRegistry.getAdapters(WarehousingAdapter.adapterType);
-        return adapters.find((adapter) => adapter.key === key) || null;
-    },
-    getAdapters: ({ adapterFilter } = {}) => {
-        const adapters = pluginRegistry.getAdapters(WarehousingAdapter.adapterType);
-        return adapters.filter(adapterFilter || (() => true));
-    },
+    ...registryDirector(WarehousingAdapter.adapterType),
     actions: async (warehousingProvider, warehousingContext, unchainedAPI) => {
         const Adapter = WarehousingDirector.getAdapter(warehousingProvider.adapterKey);
         if (!Adapter) {
@@ -145,29 +133,23 @@ export const WarehousingDirector = {
         };
     },
     async tokenMetadata(virtualProviders, warehousingContext, unchainedAPI) {
-        return virtualProviders.reduce(async (lastPromise, provider) => {
-            const last = await lastPromise;
-            if (last)
-                return last;
-            const currentDirector = await WarehousingDirector.actions(provider, warehousingContext, unchainedAPI);
-            const isActive = await currentDirector.isActive();
-            if (isActive) {
-                return currentDirector.tokenMetadata(warehousingContext.token.tokenSerialNumber);
-            }
+        const activeActions = await findFirstActiveActions(virtualProviders, warehousingContext, unchainedAPI);
+        if (!activeActions)
             return null;
-        }, Promise.resolve(null));
+        return activeActions.tokenMetadata(warehousingContext.token.tokenSerialNumber);
     },
     async isInvalidateable(virtualProviders, warehousingContext, unchainedAPI) {
-        return virtualProviders.reduce(async (lastPromise, provider) => {
-            const last = await lastPromise;
-            if (last)
-                return last;
-            const currentDirector = await WarehousingDirector.actions(provider, warehousingContext, unchainedAPI);
-            const isActive = await currentDirector.isActive();
-            if (isActive) {
-                return currentDirector.isInvalidateable(warehousingContext.token.tokenSerialNumber);
-            }
+        const activeActions = await findFirstActiveActions(virtualProviders, warehousingContext, unchainedAPI);
+        if (!activeActions)
             return null;
-        }, Promise.resolve(null));
+        return activeActions.isInvalidateable(warehousingContext.token.tokenSerialNumber);
     },
 };
+async function findFirstActiveActions(virtualProviders, warehousingContext, unchainedAPI) {
+    for (const provider of virtualProviders) {
+        const currentActions = await WarehousingDirector.actions(provider, warehousingContext, unchainedAPI);
+        if (currentActions.isActive())
+            return currentActions;
+    }
+    return null;
+}

package/lib/directors/WorkerDirector.d.ts

@@ -1,5 +1,5 @@
 import type { Work, WorkData, WorkResult } from '@unchainedshop/core-worker';
-import { type IBaseDirector } from '@unchainedshop/utils';
+import type { IBaseDirector } from '@unchainedshop/utils';
 import type { ScheduleData } from '../utils/schedule.ts';
 import { type IWorkerAdapter } from './WorkerAdapter.ts';
 import type { Modules } from '../modules.ts';