@unchainedshop/core 4.6.1 → 4.7.2

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,7 +1,18 @@
-import { ProductPricingSheet, BasePricingDirector, } from "../directors/index.js";
+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');
 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/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.js

@@ -1,11 +1,12 @@
 import { BaseDirector } from '@unchainedshop/utils';
-import { QuotationError, } from "./QuotationAdapter.js";
+import { QuotationError, QuotationAdapter, } from "./QuotationAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
+import { pluginRegistry } from "../plugins/PluginRegistry.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) {
@@ -16,6 +17,14 @@ const findAppropriateAdapters = (quotationContext, unchainedAPI) => baseDirector
 });
 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));
+    },
     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;

package/lib/directors/WarehousingDirector.js

@@ -1,7 +1,9 @@
 import { BaseDirector } from '@unchainedshop/utils';
 import { createLogger } from '@unchainedshop/logger';
 const logger = createLogger('unchained:core');
-import { DeliveryDirector, WarehousingError, } from "../directors/index.js";
+import { DeliveryDirector } from "./DeliveryDirector.js";
+import { WarehousingError, WarehousingAdapter, } from "./WarehousingAdapter.js";
+import { pluginRegistry } from "../plugins/PluginRegistry.js";
 const getReferenceDate = (context) => {
     return context && context.referenceDate ? context.referenceDate : new Date();
 };
@@ -10,8 +12,16 @@ const baseDirector = BaseDirector('WarehousingDirector', {
 });
 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));
+    },
     actions: async (warehousingProvider, warehousingContext, unchainedAPI) => {
-        const Adapter = baseDirector.getAdapter(warehousingProvider.adapterKey);
+        const Adapter = WarehousingDirector.getAdapter(warehousingProvider.adapterKey);
         if (!Adapter) {
             throw new Error(`Warehousing Plugin ${warehousingProvider.adapterKey} not available`);
         }

package/lib/directors/WorkerAdapter.js

@@ -1,6 +1,7 @@
 import { BaseAdapter } from '@unchainedshop/utils';
 export const WorkerAdapter = {
     ...BaseAdapter,
+    adapterType: Symbol.for('unchained:adapter:worker'),
     external: false,
     async doWork() {
         return { success: false };

package/lib/directors/WorkerDirector.d.ts

@@ -1,7 +1,7 @@
 import type { Work, WorkData, WorkResult } from '@unchainedshop/core-worker';
 import { type IBaseDirector } from '@unchainedshop/utils';
 import type { ScheduleData } from '../utils/schedule.ts';
-import type { IWorkerAdapter } from './WorkerAdapter.ts';
+import { type IWorkerAdapter } from './WorkerAdapter.ts';
 import type { Modules } from '../modules.ts';
 export type WorkScheduleConfiguration = Pick<WorkData, 'timeout' | 'retries' | 'priority' | 'worker' | 'scheduleId'> & {
     type: string;

package/lib/directors/WorkerDirector.js

@@ -1,5 +1,7 @@
 import { BaseDirector } from '@unchainedshop/utils';
+import { WorkerAdapter } from "./WorkerAdapter.js";
 import { createLogger } from '@unchainedshop/logger';
+import { pluginRegistry } from "../plugins/PluginRegistry.js";
 const logger = createLogger('unchained:core');
 const AutoScheduleMap = new Map();
 const baseDirector = BaseDirector('WorkerDirector', {
@@ -7,6 +9,14 @@ const baseDirector = BaseDirector('WorkerDirector', {
 });
 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));
+    },
     getActivePluginTypes: ({ external } = {}) => {
         return WorkerDirector.getAdapters()
             .filter((adapter) => {
@@ -16,26 +26,9 @@ export const WorkerDirector = {
         })
             .map((adapter) => adapter.type);
     },
-    registerAdapter: (Adapter) => {
-        if (WorkerDirector.getAdapterByType(Adapter.type))
-            throw new Error(`WorkerDirector: There is already a adapter registered with type: ${Adapter.type}`);
-        baseDirector.registerAdapter(Adapter);
-    },
     disableAutoscheduling: (type) => {
         AutoScheduleMap.delete(type);
     },
-    unregisterAdapter: (key) => {
-        const adapter = WorkerDirector.getAdapter(key);
-        const result = baseDirector.unregisterAdapter(key);
-        if (adapter) {
-            AutoScheduleMap.forEach((workItemConfiguration, scheduleId) => {
-                if (workItemConfiguration.type === adapter.type) {
-                    AutoScheduleMap.delete(scheduleId);
-                }
-            });
-        }
-        return result;
-    },
     configureAutoscheduling: (workItemConfiguration) => {
         AutoScheduleMap.set(workItemConfiguration.scheduleId || workItemConfiguration.type, workItemConfiguration);
     },

package/lib/directors/index.d.ts

@@ -39,4 +39,6 @@ export * from './FailedRescheduler.ts';
 export * from './BaseWorker.ts';
 export * from './QuotationAdapter.ts';
 export * from './QuotationDirector.ts';
+export * from './FileDirector.ts';
+export { type IFileAdapter, FileAdapter } from '@unchainedshop/core-files';
 export * from './MessagingDirector.ts';

package/lib/directors/index.js

@@ -39,4 +39,6 @@ export * from "./FailedRescheduler.js";
 export * from "./BaseWorker.js";
 export * from "./QuotationAdapter.js";
 export * from "./QuotationDirector.js";
+export * from "./FileDirector.js";
+export { FileAdapter } from '@unchainedshop/core-files';
 export * from "./MessagingDirector.js";