@unchainedshop/core 4.8.29 → 5.0.0-alpha.10

package/lib/directors/EnrollmentAdapter.js

@@ -18,12 +18,12 @@ export const periodForReferenceDate = (referenceDate, intervalCount = 1, interva
 };
 export const EnrollmentAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:enrollment'),
     isActivatedFor: () => {
         return false;
     },
     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,10 +1,8 @@
-import { BaseDirector } from '@unchainedshop/utils';
+import { EnrollmentAdapter } from "./EnrollmentAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
-const baseDirector = BaseDirector('EnrollmentDirector', {
-    adapterSortKey: 'orderIndex',
-});
-const findAppropriateAdapters = (productPlan) => baseDirector.getAdapters({
+const findAppropriateAdapters = (productPlan) => EnrollmentDirector.getAdapters({
     adapterFilter: (Adapter) => {
         const activated = Adapter.isActivatedFor(productPlan);
         if (!activated) {
@@ -14,7 +12,7 @@ const findAppropriateAdapters = (productPlan) => baseDirector.getAdapters({
     },
 });
 export const EnrollmentDirector = {
-    ...baseDirector,
+    ...registryDirector(EnrollmentAdapter.adapterType),
     transformOrderItemToEnrollment: async ({ orderPosition, product }, doc, unchainedAPI) => {
         const Adapter = findAppropriateAdapters(product.plan)?.[0];
         if (!Adapter) {
@@ -24,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/FilterAdapter.js

@@ -2,6 +2,7 @@ import { mongodb } from '@unchainedshop/mongodb';
 import { BaseAdapter } from '@unchainedshop/utils';
 export const FilterAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:filter'),
     orderIndex: 0,
     actions: () => {
         return {

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,18 +1,16 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { BaseDirector } from '@unchainedshop/utils';
 import { filterCacheGeneration, filtersSettings, FilterType, } from '@unchainedshop/core-filters';
+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,
+    ...registryDirector(FilterAdapter.adapterType),
     actions: async (filterContext, unchainedAPI) => {
         const context = { ...filterContext, ...unchainedAPI };
-        const adapters = baseDirector.getAdapters().map((Adapter) => Adapter.actions(context));
+        const adapters = FilterDirector.getAdapters().map((Adapter) => Adapter.actions(context));
         const reduceAdapters = (reducer, initialValue) => {
             if (adapters.length === 0) {
                 return initialValue;
@@ -116,7 +114,7 @@ export const FilterDirector = {
                 includeInactive: true,
             })
             : [];
-        const intersected = await filters.reduce(async (productIdSetPromise, filter) => {
+        const intersectedProductIds = await filters.reduce(async (productIdSetPromise, filter) => {
             const productIdSet = await productIdSetPromise;
             if (!parsedFilterQuery[filter.key])
                 return productIdSet;
@@ -127,7 +125,7 @@ export const FilterDirector = {
             }, unchainedAPI);
             return productIdSet.intersection(filterOptionProductIds);
         }, Promise.resolve(new Set(productIds)));
-        return productIds.filter((id) => intersected.has(id));
+        return [...intersectedProductIds];
     },
     async filterFacets(filter, params, unchainedAPI) {
         const { allProductIdSet, searchQuery, forceLiveCollection, otherFilters } = params;

package/lib/directors/OrderDiscountAdapter.d.ts

@@ -1,2 +1,3 @@
-import { type IDiscountAdapter, type OrderDiscountConfiguration } from '../directors/index.ts';
-export declare const OrderDiscountAdapter: Omit<IDiscountAdapter<OrderDiscountConfiguration>, "key" | "label" | "version">;
+import { type IDiscountAdapter } from './BaseDiscountAdapter.ts';
+import type { OrderDiscountConfiguration } from './OrderDiscountConfiguration.ts';
+export declare const OrderDiscountAdapter: Omit<IDiscountAdapter<OrderDiscountConfiguration>, 'key' | 'label' | 'version'>;

package/lib/directors/OrderDiscountAdapter.js

@@ -1,2 +1,5 @@
-import { BaseDiscountAdapter, } from "../directors/index.js";
-export const OrderDiscountAdapter = BaseDiscountAdapter;
+import { BaseDiscountAdapter } from "./BaseDiscountAdapter.js";
+export const OrderDiscountAdapter = {
+    ...BaseDiscountAdapter,
+    adapterType: Symbol.for('unchained:adapter:discount:order'),
+};

package/lib/directors/OrderDiscountDirector.js

@@ -1,2 +1,3 @@
 import { BaseDiscountDirector } from "./BaseDiscountDirector.js";
-export const OrderDiscountDirector = BaseDiscountDirector('OrderDiscountDirector');
+import { OrderDiscountAdapter } from "./OrderDiscountAdapter.js";
+export const OrderDiscountDirector = BaseDiscountDirector(OrderDiscountAdapter.adapterType);

package/lib/directors/OrderPricingAdapter.d.ts

@@ -1,4 +1,5 @@
-import { type IOrderPricingSheet, type OrderPricingCalculation, type IPricingAdapter, type BasePricingAdapterContext } from '../directors/index.ts';
+import { type IOrderPricingSheet, type OrderPricingCalculation } from './OrderPricingSheet.ts';
+import { type IPricingAdapter, type BasePricingAdapterContext } from './BasePricingAdapter.ts';
 import type { Order, OrderDelivery, OrderDiscount, OrderPayment, OrderPosition } from '@unchainedshop/core-orders';
 import type { User } from '@unchainedshop/core-users';
 import type { Modules } from '../modules.ts';

package/lib/directors/OrderPricingAdapter.js

@@ -1,7 +1,9 @@
-import { OrderPricingSheet, BasePricingAdapter, } from "../directors/index.js";
+import { OrderPricingSheet, } from "./OrderPricingSheet.js";
+import { BasePricingAdapter, } from "./BasePricingAdapter.js";
 const basePricingAdapter = BasePricingAdapter();
 export const OrderPricingAdapter = {
     ...basePricingAdapter,
+    adapterType: Symbol.for('unchained:adapter:pricing:order'),
     isActivatedFor: () => {
         return false;
     },

package/lib/directors/OrderPricingDirector.d.ts

@@ -1,4 +1,7 @@
-import { type IOrderPricingSheet, type OrderPricingCalculation, type IOrderPricingAdapter, type OrderPricingAdapterContext, type PricingDiscount, type IPricingDirector } from '../directors/index.ts';
+import { type IOrderPricingSheet, type OrderPricingCalculation } from './OrderPricingSheet.ts';
+import { type IOrderPricingAdapter, type OrderPricingAdapterContext } from './OrderPricingAdapter.ts';
+import { type IPricingDirector } from './BasePricingDirector.ts';
+import type { PricingDiscount } from './BasePricingSheet.ts';
 import type { Order, OrderDelivery, OrderPayment, OrderPosition } from '@unchainedshop/core-orders';
 export interface OrderPricingContext {
     currencyCode: string;

package/lib/directors/OrderPricingDirector.js

@@ -1,5 +1,7 @@
-import { OrderPricingSheet, BasePricingDirector, } from "../directors/index.js";
-const baseDirector = BasePricingDirector('OrderPricingDirector');
+import { OrderPricingSheet, } from "./OrderPricingSheet.js";
+import { OrderPricingAdapter, } from "./OrderPricingAdapter.js";
+import { BasePricingDirector } from "./BasePricingDirector.js";
+const baseDirector = BasePricingDirector(OrderPricingAdapter.adapterType);
 export const OrderPricingDirector = {
     ...baseDirector,
     buildPricingContext: async (context, unchainedAPI) => {

package/lib/directors/OrderPricingSheet.d.ts

@@ -1,5 +1,5 @@
 import type { PricingCalculation } from '@unchainedshop/utils';
-import { type IPricingSheet, type PricingSheetParams } from '../directors/index.ts';
+import { type IPricingSheet, type PricingSheetParams } from './BasePricingSheet.ts';
 export interface OrderPricingCalculation extends PricingCalculation {
     discountId?: string;
 }
@@ -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

@@ -1,4 +1,4 @@
-import { BasePricingSheet, } from "../directors/index.js";
+import { BasePricingSheet, } from "./BasePricingSheet.js";
 export const OrderPricingRowCategory = {
     Items: 'ITEMS',
     Discounts: 'DISCOUNTS',
@@ -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/PaymentAdapter.js

@@ -7,6 +7,7 @@ export const PaymentError = {
 };
 export const PaymentAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:payment'),
     initialConfiguration: [],
     typeSupported: () => {
         return false;

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,7 +1,7 @@
-import { BaseDirector } from '@unchainedshop/utils';
 import { createLogger } from '@unchainedshop/logger';
-import { PaymentError, } from "./PaymentAdapter.js";
+import { PaymentError, PaymentAdapter, } from "./PaymentAdapter.js";
 import { OrderPaymentStatus } from '@unchainedshop/core-orders';
+import { registryDirector } from "./registryDirector.js";
 const buildPaymentProviderActionsContext = (orderPayment, { transactionContext, ...rest }) => ({
     ...rest,
     orderPayment,
@@ -11,11 +11,10 @@ const buildPaymentProviderActionsContext = (orderPayment, { transactionContext,
     },
 });
 const logger = createLogger('unchained:core:payment');
-const baseDirector = BaseDirector('PaymentDirector');
 export const PaymentDirector = {
-    ...baseDirector,
+    ...registryDirector(PaymentAdapter.adapterType),
     actions: async (paymentProvider, paymentContext, unchainedAPI) => {
-        const Adapter = baseDirector.getAdapter(paymentProvider.adapterKey);
+        const Adapter = PaymentDirector.getAdapter(paymentProvider.adapterKey);
         if (!Adapter) {
             throw new Error(`Payment Plugin ${paymentProvider.adapterKey} not available`);
         }

package/lib/directors/PaymentPricingAdapter.d.ts

@@ -1,5 +1,6 @@
 import type { PricingCalculation } from '@unchainedshop/utils';
-import { type BasePricingAdapterContext, type IPricingAdapter, type IPricingSheet } from '../directors/index.ts';
+import { type BasePricingAdapterContext, type IPricingAdapter } from './BasePricingAdapter.ts';
+import type { IPricingSheet } from './BasePricingSheet.ts';
 import type { PaymentProvider } from '@unchainedshop/core-payment';
 import type { OrderDiscount, OrderPayment, Order } from '@unchainedshop/core-orders';
 import type { User } from '@unchainedshop/core-users';

package/lib/directors/PaymentPricingAdapter.js

@@ -1,8 +1,9 @@
-import { BasePricingAdapter, } from "../directors/index.js";
+import { BasePricingAdapter, } from "./BasePricingAdapter.js";
 import { PaymentPricingSheet } from "./PaymentPricingSheet.js";
 const basePricingAdapter = BasePricingAdapter();
 export const PaymentPricingAdapter = {
     ...basePricingAdapter,
+    adapterType: Symbol.for('unchained:adapter:pricing:payment'),
     isActivatedFor: () => {
         return false;
     },

package/lib/directors/PaymentPricingDirector.d.ts

@@ -1,4 +1,5 @@
-import { type IPricingDirector, type IPaymentPricingAdapter, type IPaymentPricingSheet, type PaymentPricingAdapterContext, type PaymentPricingCalculation } from '../directors/index.ts';
+import { type IPricingDirector } from './BasePricingDirector.ts';
+import { type IPaymentPricingAdapter, type IPaymentPricingSheet, type PaymentPricingAdapterContext, type PaymentPricingCalculation } from './PaymentPricingAdapter.ts';
 import type { PaymentProvider } from '@unchainedshop/core-payment';
 import type { OrderPayment, Order } from '@unchainedshop/core-orders';
 import type { User } from '@unchainedshop/core-users';

package/lib/directors/PaymentPricingDirector.js

@@ -1,6 +1,7 @@
-import { BasePricingDirector, } from "../directors/index.js";
+import { BasePricingDirector } from "./BasePricingDirector.js";
+import { PaymentPricingAdapter, } from "./PaymentPricingAdapter.js";
 import { PaymentPricingSheet } from "./PaymentPricingSheet.js";
-const baseDirector = BasePricingDirector('PaymentPricingDirector');
+const baseDirector = BasePricingDirector(PaymentPricingAdapter.adapterType);
 export const PaymentPricingDirector = {
     ...baseDirector,
     async buildPricingContext(context, unchainedAPI) {

package/lib/directors/PaymentPricingSheet.d.ts

@@ -1,4 +1,5 @@
-import { type PaymentPricingCalculation, type IPaymentPricingSheet, type PricingSheetParams } from '../directors/index.ts';
+import { type PaymentPricingCalculation, type IPaymentPricingSheet } from './PaymentPricingAdapter.ts';
+import { type PricingSheetParams } from './BasePricingSheet.ts';
 export declare const PaymentPricingRowCategory: {
     readonly Item: "ITEM";
     readonly Payment: "PAYMENT";

package/lib/directors/PaymentPricingSheet.js

@@ -1,4 +1,5 @@
-import { BasePricingSheet, } from "../directors/index.js";
+import {} from "./PaymentPricingAdapter.js";
+import { BasePricingSheet, } from "./BasePricingSheet.js";
 export const PaymentPricingRowCategory = {
     Item: 'ITEM',
     Payment: 'PAYMENT',

package/lib/directors/ProductDiscountAdapter.d.ts

@@ -1,2 +1,3 @@
-import { type IDiscountAdapter, type ProductDiscountConfiguration } from '../directors/index.ts';
-export declare const ProductDiscountAdapter: Omit<IDiscountAdapter<ProductDiscountConfiguration>, "key" | "label" | "version">;
+import { type IDiscountAdapter } from './BaseDiscountAdapter.ts';
+import type { ProductDiscountConfiguration } from './ProductDiscountConfiguration.ts';
+export declare const ProductDiscountAdapter: Omit<IDiscountAdapter<ProductDiscountConfiguration>, 'key' | 'label' | 'version'>;

package/lib/directors/ProductDiscountAdapter.js

@@ -1,2 +1,5 @@
-import { BaseDiscountAdapter, } from "../directors/index.js";
-export const ProductDiscountAdapter = BaseDiscountAdapter;
+import { BaseDiscountAdapter } from "./BaseDiscountAdapter.js";
+export const ProductDiscountAdapter = {
+    ...BaseDiscountAdapter,
+    adapterType: Symbol.for('unchained:adapter:discount:product'),
+};

package/lib/directors/ProductDiscountDirector.d.ts

@@ -1,2 +1,2 @@
-import { type ProductDiscountConfiguration } from '../directors/index.ts';
+import type { ProductDiscountConfiguration } from './ProductDiscountConfiguration.ts';
 export declare const ProductDiscountDirector: import("./BaseDiscountDirector.ts").IDiscountDirector<ProductDiscountConfiguration>;

package/lib/directors/ProductDiscountDirector.js

@@ -1,2 +1,3 @@
-import { BaseDiscountDirector } from "../directors/index.js";
-export const ProductDiscountDirector = BaseDiscountDirector('ProductDiscountDirector');
+import { BaseDiscountDirector } from "./BaseDiscountDirector.js";
+import { ProductDiscountAdapter } from "./ProductDiscountAdapter.js";
+export const ProductDiscountDirector = BaseDiscountDirector(ProductDiscountAdapter.adapterType);

package/lib/directors/ProductPricingAdapter.d.ts

@@ -1,6 +1,7 @@
 import type { Product, ProductConfiguration } from '@unchainedshop/core-products';
 import type { Order } from '@unchainedshop/core-orders';
-import { type IProductPricingSheet, type ProductPricingCalculation, type BasePricingAdapterContext, type IPricingAdapter } from '../directors/index.ts';
+import { type IProductPricingSheet, type ProductPricingCalculation } from './ProductPricingSheet.ts';
+import { type BasePricingAdapterContext, type IPricingAdapter } from './BasePricingAdapter.ts';
 import type { Modules } from '../modules.ts';
 import type { User } from '@unchainedshop/core-users';
 export interface ProductPricingAdapterContext extends BasePricingAdapterContext {

package/lib/directors/ProductPricingAdapter.js

@@ -1,7 +1,9 @@
-import { ProductPricingSheet, BasePricingAdapter, } from "../directors/index.js";
+import { ProductPricingSheet, } from "./ProductPricingSheet.js";
+import { BasePricingAdapter, } from "./BasePricingAdapter.js";
 const basePricingAdapter = BasePricingAdapter();
 export const ProductPricingAdapter = {
     ...basePricingAdapter,
+    adapterType: Symbol.for('unchained:adapter:pricing:product'),
     isActivatedFor: () => {
         return false;
     },

package/lib/directors/ProductPricingDirector.d.ts

@@ -1,7 +1,9 @@
 import type { Product, ProductConfiguration } from '@unchainedshop/core-products';
 import type { User } from '@unchainedshop/core-users';
 import type { Order, OrderDiscount, OrderPosition } from '@unchainedshop/core-orders';
-import { type IProductPricingSheet, type ProductPricingCalculation, type IProductPricingAdapter, type ProductPricingAdapterContext, type IPricingDirector } from '../directors/index.ts';
+import { type IProductPricingSheet, type ProductPricingCalculation } from './ProductPricingSheet.ts';
+import { type IProductPricingAdapter, type ProductPricingAdapterContext } from './ProductPricingAdapter.ts';
+import { type IPricingDirector } from './BasePricingDirector.ts';
 export type ProductPricingContext = {
     currencyCode: string;
     countryCode: string;

package/lib/directors/ProductPricingDirector.js

@@ -1,5 +1,7 @@
-import { ProductPricingSheet, BasePricingDirector, } from "../directors/index.js";
-const baseDirector = BasePricingDirector('ProductPricingDirector');
+import { ProductPricingSheet, } from "./ProductPricingSheet.js";
+import { ProductPricingAdapter, } from "./ProductPricingAdapter.js";
+import { BasePricingDirector } from "./BasePricingDirector.js";
+const baseDirector = BasePricingDirector(ProductPricingAdapter.adapterType);
 export const ProductPricingDirector = {
     ...baseDirector,
     async buildPricingContext(context, unchainedAPI) {

package/lib/directors/ProductPricingSheet.d.ts

@@ -1,5 +1,5 @@
 import type { Price, PricingCalculation } from '@unchainedshop/utils';
-import { type IPricingSheet, type PricingSheetParams } from '../directors/index.ts';
+import { type IPricingSheet, type PricingSheetParams } from './BasePricingSheet.ts';
 export interface ProductPricingCalculation extends PricingCalculation {
     discountId?: string;
     isTaxable: boolean;

package/lib/directors/ProductPricingSheet.js

@@ -1,4 +1,4 @@
-import { BasePricingSheet } from "../directors/index.js";
+import { BasePricingSheet } from "./BasePricingSheet.js";
 export const ProductPricingRowCategory = {
     Item: 'ITEM',
     Discount: 'DISCOUNT',

package/lib/directors/QuotationAdapter.js

@@ -7,6 +7,7 @@ export const QuotationError = {
 };
 export const QuotationAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:quotation'),
     orderIndex: 0,
     isActivatedFor: () => {
         return false;

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,8 @@
-import { BaseDirector } from '@unchainedshop/utils';
-import { QuotationError, } from "./QuotationAdapter.js";
+import { QuotationError, QuotationAdapter, } from "./QuotationAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
+import { registryDirector } from "./registryDirector.js";
 const logger = createLogger('unchained:core');
-const baseDirector = BaseDirector('QuotationDirector', {
-    adapterSortKey: 'orderIndex',
-});
-const findAppropriateAdapters = (quotationContext, unchainedAPI) => baseDirector.getAdapters({
+const findAppropriateAdapters = (quotationContext, unchainedAPI) => QuotationDirector.getAdapters({
     adapterFilter: (Adapter) => {
         const activated = Adapter.isActivatedFor(quotationContext, unchainedAPI);
         if (!activated) {
@@ -15,7 +12,7 @@ const findAppropriateAdapters = (quotationContext, unchainedAPI) => baseDirector
     },
 });
 export const QuotationDirector = {
-    ...baseDirector,
+    ...registryDirector(QuotationAdapter.adapterType),
     actions: async (quotationContext, unchainedAPI) => {
         const context = { ...quotationContext, ...unchainedAPI };
         const Adapter = findAppropriateAdapters(quotationContext, unchainedAPI)?.shift();

package/lib/directors/WarehousingAdapter.js

@@ -7,6 +7,7 @@ export const WarehousingError = {
 };
 export const WarehousingAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:warehousing'),
     orderIndex: 0,
     typeSupported: () => {
         return false;

package/lib/directors/WarehousingDirector.d.ts

@@ -1,6 +1,6 @@
 import type { IBaseDirector } from '@unchainedshop/utils';
 import type { WarehousingProvider, TokenSurrogate } from '@unchainedshop/core-warehousing';
-import { type IWarehousingAdapter, type WarehousingContext, WarehousingError } from '../directors/index.ts';
+import { type IWarehousingAdapter, type WarehousingContext, WarehousingError } from './WarehousingAdapter.ts';
 import type { Modules } from '../modules.ts';
 export interface EstimatedDispatch {
     shipping?: Date;