Free utils from core dependencies, starting to move services to core

package.json

@@ -72,7 +72,7 @@
     "dev:watch-packages": "workspaces-run --ignore '@unchainedshop/shared' --only-fs 'packages/**' --parallel -- npm run watch",
     "update-version": "npm version --no-git-tag-version --workspaces --include-workspace-root",
     "clean": "npm run clean --workspaces",
-    "build": "npm run build --workspaces",
+    "build": "npm run prepublishOnly --workspaces --if-present",
     "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --ci --forceExit --config ./packages/unit-jest.config.js",
     "test:unit-watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --watch --config ./packages/unit-jest.config.js"
   },

packages/core-delivery/src/director/DeliveryPricingAdapter.ts

@@ -9,6 +9,7 @@ import {
 import { DeliveryProvider } from '../types.js';
 import { OrderDelivery, OrderDiscount, Order } from '@unchainedshop/core-orders';
 import { User } from '@unchainedshop/core-users';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export interface DeliveryPricingCalculation extends PricingCalculation {
   discountId?: string;
@@ -35,7 +36,7 @@ export type IDeliveryPricingSheet = IPricingSheet<DeliveryPricingCalculation> &
   }) => void;
 };
 
-export interface DeliveryPricingAdapterContext extends BasePricingAdapterContext {
+export interface DeliveryPricingAdapterContext extends BasePricingAdapterContext, UnchainedCore {
   country?: string;
   currency?: string;
   provider: DeliveryProvider;

packages/core-delivery/src/director/DeliveryPricingDirector.ts

@@ -11,6 +11,7 @@ import {
   IDeliveryPricingAdapter,
   IDeliveryPricingSheet,
 } from './DeliveryPricingAdapter.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export type DeliveryPricingContext =
   | {
@@ -28,7 +29,8 @@ export type IDeliveryPricingDirector<DiscountConfiguration = unknown> = IPricing
   DeliveryPricingCalculation,
   DeliveryPricingAdapterContext,
   IDeliveryPricingSheet,
-  IDeliveryPricingAdapter<DiscountConfiguration>
+  IDeliveryPricingAdapter<DiscountConfiguration>,
+  UnchainedCore
 >;
 
 const baseDirector = BasePricingDirector<

packages/core-orders/src/director/OrderDiscountAdapter.ts

@@ -1,7 +1,8 @@
 import { BaseDiscountAdapter, IDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountConfiguration } from './OrderDiscountConfiguration.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export const OrderDiscountAdapter: Omit<
-  IDiscountAdapter<OrderDiscountConfiguration>,
+  IDiscountAdapter<OrderDiscountConfiguration, UnchainedCore>,
   'key' | 'label' | 'version'
 > = BaseDiscountAdapter;

packages/core-orders/src/director/OrderDiscountDirector.ts

@@ -1,5 +1,7 @@
+import { UnchainedCore } from '@unchainedshop/core';
 import { BaseDiscountDirector } from '@unchainedshop/utils';
 import { OrderDiscountConfiguration } from './OrderDiscountConfiguration.js';
 
-export const OrderDiscountDirector =
-  BaseDiscountDirector<OrderDiscountConfiguration>('OrderDiscountDirector');
+export const OrderDiscountDirector = BaseDiscountDirector<OrderDiscountConfiguration, UnchainedCore>(
+  'OrderDiscountDirector',
+);

packages/core-orders/src/director/OrderPricingAdapter.ts

@@ -1,9 +1,10 @@
+import { UnchainedCore } from '@unchainedshop/core';
 import { BasePricingAdapter, IPricingAdapter, BasePricingAdapterContext } from '@unchainedshop/utils';
 import { IOrderPricingSheet, OrderPricingCalculation, OrderPricingSheet } from './OrderPricingSheet.js';
 import { Order, OrderDelivery, OrderDiscount, OrderPayment, OrderPosition } from '../types.js';
 import { User } from '@unchainedshop/core-users';
 
-export interface OrderPricingAdapterContext extends BasePricingAdapterContext {
+export interface OrderPricingAdapterContext extends BasePricingAdapterContext, UnchainedCore {
   currency?: string;
   discounts: Array<OrderDiscount>;
   order: Order;

packages/core-orders/src/director/OrderPricingDirector.ts

@@ -6,6 +6,7 @@ import {
   OrderPricingAdapterContext,
   OrderPricingContext,
 } from './OrderPricingAdapter.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export type OrderPrice = { _id?: string; amount: number; currency: string };
 
@@ -21,7 +22,8 @@ export type IOrderPricingDirector<DiscountConfiguration = unknown> = IPricingDir
   OrderPricingCalculation,
   OrderPricingAdapterContext,
   IOrderPricingSheet,
-  IOrderPricingAdapter<DiscountConfiguration>
+  IOrderPricingAdapter<DiscountConfiguration>,
+  UnchainedCore
 >;
 
 const baseDirector = BasePricingDirector<

packages/core-payment/src/director/PaymentPricingAdapter.ts

@@ -4,6 +4,7 @@ import {
   IPricingSheet,
   PricingCalculation,
 } from '@unchainedshop/utils';
+import { UnchainedCore } from '@unchainedshop/core';
 import { BasePricingAdapter } from '@unchainedshop/utils';
 import { PaymentPricingSheet } from './PaymentPricingSheet.js';
 import { User } from '@unchainedshop/core-users';
@@ -18,7 +19,7 @@ export interface PaymentPricingCalculation extends PricingCalculation {
   isNetPrice: boolean;
   rate?: number;
 }
-export interface PaymentPricingAdapterContext extends BasePricingAdapterContext {
+export interface PaymentPricingAdapterContext extends BasePricingAdapterContext, UnchainedCore {
   country?: string;
   currency?: string;
   user: User;

packages/core-payment/src/director/PaymentPricingDirector.ts

@@ -11,6 +11,7 @@ import { Order } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '../types.js';
 import { OrderPayment } from '@unchainedshop/core-orders';
 import { IPricingDirector } from '@unchainedshop/utils';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export type PaymentPricingContext =
   | {
@@ -30,7 +31,8 @@ export type IPaymentPricingDirector<DiscountConfiguration = unknown> = IPricingD
   PaymentPricingCalculation,
   PaymentPricingAdapterContext,
   IPaymentPricingSheet,
-  IPaymentPricingAdapter<DiscountConfiguration>
+  IPaymentPricingAdapter<DiscountConfiguration>,
+  UnchainedCore
 >;
 
 const baseDirector = BasePricingDirector<

packages/core-products/src/director/ProductDiscountAdapter.ts

@@ -1,7 +1,8 @@
 import { BaseDiscountAdapter, IDiscountAdapter } from '@unchainedshop/utils';
 import { ProductDiscountConfiguration } from './ProductDiscountConfiguration.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export const ProductDiscountAdapter: Omit<
-  IDiscountAdapter<ProductDiscountConfiguration>,
+  IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore>,
   'key' | 'label' | 'version'
 > = BaseDiscountAdapter;

packages/core-products/src/director/ProductDiscountDirector.ts

@@ -1,5 +1,7 @@
+import { UnchainedCore } from '@unchainedshop/core';
 import { BaseDiscountDirector } from '@unchainedshop/utils';
 import { ProductDiscountConfiguration } from './ProductDiscountConfiguration.js';
 
-export const ProductDiscountDirector =
-  BaseDiscountDirector<ProductDiscountConfiguration>('ProductDiscountDirector');
+export const ProductDiscountDirector = BaseDiscountDirector<ProductDiscountConfiguration, UnchainedCore>(
+  'ProductDiscountDirector',
+);

packages/core-products/src/director/ProductPricingDirector.ts

@@ -7,6 +7,7 @@ import {
 } from '../types.js';
 import { BasePricingDirector } from '@unchainedshop/utils';
 import { ProductPricingSheet } from './ProductPricingSheet.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 const baseDirector = BasePricingDirector<
   ProductPricingContext,

packages/core-products/src/module/configureProductsModule.ts

@@ -122,7 +122,7 @@ export type ProductsModule = {
   productExists: (params: { productId?: string; slug?: string }) => Promise<boolean>;
 
   // Transformations
-  interface: (productDiscount: ProductDiscount) => IDiscountAdapter<unknown>;
+  interface: (productDiscount: ProductDiscount) => IDiscountAdapter<unknown, UnchainedCore>;
 
   isActive: (product: Product) => boolean;
   isDraft: (product: Product) => boolean;

packages/core-products/src/types.ts

@@ -4,6 +4,7 @@ import { TimestampFields, mongodb } from '@unchainedshop/mongodb';
 import { OrderDiscount } from '@unchainedshop/core-orders';
 import { OrderPosition } from '@unchainedshop/core-orders';
 import { OrderPrice } from '@unchainedshop/core-orders';
+import { UnchainedCore } from '@unchainedshop/core';
 import {
   BasePricingAdapterContext,
   IPricingAdapter,
@@ -234,7 +235,7 @@ export interface ProductPricingCalculation extends PricingCalculation {
   rate?: number;
 }
 
-export interface ProductPricingAdapterContext extends BasePricingAdapterContext {
+export interface ProductPricingAdapterContext extends BasePricingAdapterContext, UnchainedCore {
   country: string;
   currency: string;
   product: Product;
@@ -295,7 +296,8 @@ export type IProductPricingDirector<DiscountConfiguration = unknown> = IPricingD
   ProductPricingCalculation,
   ProductPricingAdapterContext,
   IProductPricingSheet,
-  IProductPricingAdapter<DiscountConfiguration>
+  IProductPricingAdapter<DiscountConfiguration>,
+  UnchainedCore
 >;
 
 export type ProductPriceRate = {

packages/core-users/package.json

@@ -33,6 +33,7 @@
     "@unchainedshop/logger": "^3.0.0-alpha4",
     "@unchainedshop/roles": "^3.0.0-alpha4",
     "@unchainedshop/utils": "^3.0.0-alpha4",
+    "@unchainedshop/mongodb": "^3.0.0-alpha4",
     "bcryptjs": "^2.4.3",
     "fido2-lib": "^3.5.3"
   },

packages/core-users/src/module/configureUsersModule.ts

@@ -8,17 +8,13 @@ import {
   mongodb,
   generateDbObjectId,
 } from '@unchainedshop/mongodb';
-import { systemLocale } from '@unchainedshop/utils';
-import { FileDirector } from '@unchainedshop/file-upload';
-import { SortDirection, SortOption } from '@unchainedshop/utils';
+import { systemLocale, SortDirection, SortOption } from '@unchainedshop/utils';
 import { UsersCollection } from '../db/UsersCollection.js';
 import addMigrations from './addMigrations.js';
 import { userSettings, UserSettingsOptions } from '../users-settings.js';
 import { configureUsersWebAuthnModule, UsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
 import * as pbkdf2 from './pbkdf2.js';
 import * as sha256 from './sha256.js';
-import { UserServices } from '../services/userServices.js';
-import { FileServices, FilesModule } from '@unchainedshop/core-files';
 
 export type UsersModule = {
   // Submodules
@@ -126,20 +122,6 @@ export const buildFindSelector = ({ includeGuests, queryString, ...rest }: UserQ
   return selector;
 };
 
-FileDirector.registerFileUploadCallback<{
-  services: {
-    users: UserServices;
-    files: FileServices;
-  };
-  modules: {
-    users: UsersModule;
-    files: FilesModule;
-  };
-}>('user-avatars', async (file, context) => {
-  const { services } = context;
-  return services.users.updateUserAvatarAfterUpload({ file }, context);
-});
-
 export const configureUsersModule = async ({
   db,
   options,

packages/core-users/src/users-index.ts

@@ -1,4 +1,3 @@
 export * from './types.js';
 export * from './module/configureUsersModule.js';
-export * from './services/userServices.js';
 export * from './users-settings.js';

packages/core/src/core-index.ts

@@ -61,16 +61,12 @@ import {
   QuotationsModule,
   QuotationsSettingsOptions,
 } from '@unchainedshop/core-quotations';
-import {
-  configureUsersModule,
-  UserServices,
-  userServices,
-  UserSettingsOptions,
-  UsersModule,
-} from '@unchainedshop/core-users';
+import { configureUsersModule, UserSettingsOptions, UsersModule } from '@unchainedshop/core-users';
 import { configureWarehousingModule, WarehousingModule } from '@unchainedshop/core-warehousing';
 import { configureWorkerModule, WorkerModule, WorkerSettingsOptions } from '@unchainedshop/core-worker';
 import { mongodb, MigrationRepository, ModuleInput } from '@unchainedshop/mongodb';
+import { migrateUserDataService } from './services/migrateUserDataService.js';
+import { updateUserAvatarAfterUploadService } from './services/updateUserAvatarAfterUploadService.js';
 
 export * from './types.js';
 
@@ -123,6 +119,11 @@ export interface Modules {
   worker: WorkerModule;
 }
 
+export interface UserServices {
+  updateUserAvatarAfterUpload: typeof updateUserAvatarAfterUploadService;
+  migrateUserData: typeof migrateUserDataService;
+}
+
 export interface Services {
   bookmarks: BookmarkServices;
   files: FileServices;
@@ -270,7 +271,10 @@ export const initCore = async ({
       files: fileServices,
       orders: orderServices,
       products: productServices,
-      users: userServices,
+      users: {
+        migrateUserData: migrateUserDataService,
+        updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
+      },
       ...services,
     },
     bulkImporter,

packages/core-users/src/services/migrateUserDataService.ts → packages/core/src/services/migrateUserDataService.ts

@@ -1,10 +1,21 @@
-import { UnchainedCore } from '@unchainedshop/core';
-import { userSettings } from '../users-settings.js';
+import { userSettings, UsersModule } from '@unchainedshop/core-users';
 
 export type MigrateUserDataService = (
   userIdBeforeLogin,
   userId,
-  unchainedAPI: UnchainedCore,
+  unchainedAPI: {
+    modules: {
+      users: UsersModule;
+    };
+    services: {
+      orders: {
+        migrateOrderCarts: any;
+      };
+      bookmarks: {
+        migrateBookmarks: any;
+      };
+    };
+  },
 ) => Promise<void>;
 
 export const migrateUserDataService: MigrateUserDataService = async (

packages/core-users/src/services/updateUserAvatarAfterUploadService.ts → packages/core/src/services/updateUserAvatarAfterUploadService.ts

@@ -1,6 +1,6 @@
 import { File, FileServices, FilesModule } from '@unchainedshop/core-files';
 import { log, LogLevel } from '@unchainedshop/logger';
-import { UsersModule } from '../users-index.js';
+import { UsersModule } from '@unchainedshop/core-users/lib/users-index.js';
 
 export type UpdateUserAvatarAfterUploadService = (
   params: { file: File },

packages/platform/src/setup/setupUploadHandlers.ts

@@ -0,0 +1,9 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { FileDirector } from '../../../file-upload/lib/file-upload-index.js';
+
+export const setupUploadHandlers = () => {
+  FileDirector.registerFileUploadCallback<UnchainedCore>('user-avatars', async (file, context) => {
+    const { services } = context;
+    return services.users.updateUserAvatarAfterUpload({ file }, context);
+  });
+};

packages/platform/src/startPlatform.ts

@@ -8,6 +8,7 @@ import { WorkerDirector } from '@unchainedshop/core-worker';
 import { BulkImportHandler, createBulkImporterFactory } from './bulk-importer/createBulkImporter.js';
 import { runMigrations } from './migrations/runMigrations.js';
 import { setupAccounts } from './setup/setupAccounts.js';
+import { setupUploadHandlers } from './setup/setupUploadHandlers.js';
 import { SetupCartsOptions, setupCarts } from './setup/setupCarts.js';
 import { setupTemplates, MessageTypes } from './setup/setupTemplates.js';
 import { SetupWorkqueueOptions, setupWorkqueue } from './setup/setupWorkqueue.js';
@@ -99,6 +100,9 @@ export const startPlatform = async ({
   // Setup email templates
   setupTemplates(unchainedAPI);
 
+  // Setup file upload handlers
+  setupUploadHandlers();
+
   // Start the graphQL server
   const graphqlHandler = await startAPIServer({
     unchainedAPI,

packages/plugins/src/pricing/discount-100-off.ts

@@ -4,8 +4,9 @@ import {
   OrderDiscountAdapter,
   OrderDiscountConfiguration,
 } from '@unchainedshop/core-orders';
+import { UnchainedCore } from '@unchainedshop/core';
 
-export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration> = {
+export const HundredOff: IDiscountAdapter<OrderDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.100-off',

packages/plugins/src/pricing/discount-half-price-manual.ts

@@ -1,8 +1,9 @@
+import { UnchainedCore } from '@unchainedshop/core';
 import { IDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
 import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
 
-export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration> = {
+export const HalfPriceManual: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price-manual',

packages/plugins/src/pricing/discount-half-price.ts

@@ -1,8 +1,9 @@
+import { UnchainedCore } from '@unchainedshop/core';
 import { IDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountDirector, OrderDiscountAdapter } from '@unchainedshop/core-orders';
 import { ProductDiscountConfiguration } from '@unchainedshop/core-products';
 
-export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration> = {
+export const HalfPrice: IDiscountAdapter<ProductDiscountConfiguration, UnchainedCore> = {
   ...OrderDiscountAdapter,
 
   key: 'shop.unchained.discount.half-price',