@unchainedshop/platform 3.0.0-alpha2 → 3.0.0-alpha3

package/src/setup/setupAccounts.ts

@@ -1,4 +1,4 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { subscribe } from '@unchainedshop/events';
 
 export const setupAccounts = (unchainedAPI: UnchainedCore) => {

package/src/setup/setupCarts.ts

@@ -1,4 +1,4 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export interface SetupCartsOptions {
   invalidateProviders?: boolean;
@@ -24,7 +24,7 @@ export const setupCarts = async (unchainedAPI: UnchainedCore, options: SetupCart
         return unchainedAPI.services.orders.nextUserCart(
           {
             user,
-            countryCode: locale.country,
+            countryCode: locale.region,
           },
           unchainedAPI,
         );

package/src/setup/setupTemplates.ts

@@ -1,7 +1,7 @@
 import { MessagingDirector } from '@unchainedshop/core-messaging';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { subscribe } from '@unchainedshop/events';
-import { Order, OrderStatus } from '@unchainedshop/types/orders.js';
+import { Order, OrderStatus } from '@unchainedshop/core-orders';
 import { RawPayloadType } from '@unchainedshop/events/EventDirector.js';
 import { resolveOrderRejectionTemplate } from '../templates/resolveOrderRejectionTemplate.js';
 import { resolveAccountActionTemplate } from '../templates/resolveAccountActionTemplate.js';

package/src/setup/setupWorkqueue.ts

@@ -1,6 +1,11 @@
-import { EventListenerWorker, FailedRescheduler, IntervalWorker } from '@unchainedshop/core-worker';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { WorkData, WorkerSchedule } from '@unchainedshop/types/worker.js';
+import {
+  EventListenerWorker,
+  FailedRescheduler,
+  IntervalWorker,
+  WorkerSchedule,
+  WorkData,
+} from '@unchainedshop/core-worker';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export interface SetupWorkqueueOptions {
   batchCount?: number;

package/src/startPlatform.ts

@@ -1,12 +1,10 @@
-import { startAPIServer, GraphQLServerOptions, roles } from '@unchainedshop/api';
-import { initCore } from '@unchainedshop/core';
-import { initDb } from '@unchainedshop/mongodb';
+import { startAPIServer, roles, UnchainedServerOptions } from '@unchainedshop/api';
+import { initCore, UnchainedCoreOptions } from '@unchainedshop/core';
+import { initDb, mongodb } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
-import { UnchainedCore, UnchainedCoreOptions } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { getRegisteredEvents } from '@unchainedshop/events';
 import { WorkerDirector } from '@unchainedshop/core-worker';
-import { AdminUiConfig } from '@unchainedshop/types/api.js';
-import { Db } from 'mongodb';
 import { BulkImportHandler, createBulkImporterFactory } from './bulk-importer/createBulkImporter.js';
 import { runMigrations } from './migrations/runMigrations.js';
 import { setupAccounts } from './setup/setupAccounts.js';
@@ -14,6 +12,7 @@ import { SetupCartsOptions, setupCarts } from './setup/setupCarts.js';
 import { setupTemplates, MessageTypes } from './setup/setupTemplates.js';
 import { SetupWorkqueueOptions, setupWorkqueue } from './setup/setupWorkqueue.js';
 import { createMigrationRepository } from './migrations/migrationRepository.js';
+import { IRoleOptionConfig } from '@unchainedshop/roles';
 
 export { MessageTypes };
 
@@ -21,15 +20,20 @@ export type PlatformOptions = {
   bulkImporter?: {
     handlers?: Record<string, BulkImportHandler>;
   };
-  context?: any;
-  workQueueOptions?: SetupWorkqueueOptions & SetupCartsOptions;
-  adminUiConfig?: AdminUiConfig;
-} & Partial<Pick<UnchainedCoreOptions, 'modules' | 'services' | 'options' | 'rolesOptions'>> &
-  GraphQLServerOptions;
+  rolesOptions?: IRoleOptionConfig;
+  workQueueOptions?: SetupWorkqueueOptions & SetupCartsOptions & { skipInvalidationOnStartup?: boolean };
+} & Omit<UnchainedCoreOptions, 'bulkImporter' | 'migrationRepository' | 'db'> &
+  Omit<UnchainedServerOptions, 'roles' | 'unchainedAPI' | 'workTypes' | 'events'>;
 
 const logger = createLogger('unchained');
 
-const REQUIRED_ENV_VARIABLES = ['EMAIL_WEBSITE_NAME', 'EMAIL_WEBSITE_URL', 'EMAIL_FROM'];
+const REQUIRED_ENV_VARIABLES = [
+  'EMAIL_WEBSITE_NAME',
+  'EMAIL_WEBSITE_URL',
+  'EMAIL_FROM',
+  'ROOT_URL',
+  'UNCHAINED_TOKEN_SECRET',
+];
 
 const { UNCHAINED_DISABLE_WORKER } = process.env;
 
@@ -49,18 +53,17 @@ const checkWorkQueueEnabled = (options: SetupWorkqueueOptions) => {
 export const queueWorkers: Array<any> = [];
 
 export const startPlatform = async ({
-  modules = {},
-  services = {},
-  options = {},
-  adminUiConfig = {},
+  modules,
+  services,
+  options,
   rolesOptions = {},
   bulkImporter: bulkImporterOptions,
   workQueueOptions,
-  ...arbitraryGraphQLServerOptions
+  ...arbitraryAPIServerConfiguration
 }: PlatformOptions): Promise<{
   unchainedAPI: UnchainedCore;
-  yogaServer: any;
-  db: Db;
+  graphqlHandler: any;
+  db: mongodb.Db;
 }> => {
   exitOnMissingEnvironmentVariables();
 
@@ -79,7 +82,6 @@ export const startPlatform = async ({
     modules,
     services,
     options,
-    rolesOptions,
   });
 
   const isWorkQueueEnabled = checkWorkQueueEnabled(workQueueOptions);
@@ -98,13 +100,12 @@ export const startPlatform = async ({
   setupTemplates(unchainedAPI);
 
   // Start the graphQL server
-  const yogaServer = await startAPIServer({
+  const graphqlHandler = await startAPIServer({
     unchainedAPI,
     roles: configuredRoles,
     events: configuredEvents,
     workTypes: configuredWorkTypes,
-    adminUiConfig,
-    ...arbitraryGraphQLServerOptions,
+    ...arbitraryAPIServerConfiguration,
   });
 
   // Setup work queues for scheduled work
@@ -115,9 +116,9 @@ export const startPlatform = async ({
   }
 
   // Setup filter cache
-  if (!options.filters?.skipInvalidationOnStartup) {
+  if (!workQueueOptions?.skipInvalidationOnStartup) {
     setImmediate(() => unchainedAPI.modules.filters.invalidateCache({}, unchainedAPI));
   }
 
-  return { unchainedAPI, yogaServer, db };
+  return { unchainedAPI, graphqlHandler, db };
 };

package/src/templates/order-parser/formatAddress.ts

@@ -1,4 +1,4 @@
-import { Address } from '@unchainedshop/types/common.js';
+import type { Address } from '@unchainedshop/mongodb';
 
 export const formatAddress = (address: Address) => {
   return [

package/src/templates/order-parser/getOrderPositionsData.ts

@@ -1,13 +1,12 @@
-import { Locale } from '@unchainedshop/types/common.js';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { Order } from '@unchainedshop/core-orders';
 import formatPrice from './formatPrice.js';
 
 type PriceFormatter = ({ amount, currency }: { amount: number; currency: string }) => string;
 
 export const getOrderPositionsData = async (
   order: Order,
-  params: { locale?: Locale; useNetPrice?: boolean; format?: PriceFormatter },
+  params: { locale?: Intl.Locale; useNetPrice?: boolean; format?: PriceFormatter },
   context: UnchainedCore,
 ) => {
   const { modules } = context;
@@ -20,11 +19,11 @@ export const getOrderPositionsData = async (
     orderPositions.map(async (orderPosition) => {
       const productTexts = await modules.products.texts.findLocalizedText({
         productId: orderPosition.productId,
-        locale: params.locale?.normalized,
+        locale: params.locale?.baseName,
       });
       const originalProductTexts = await modules.products.texts.findLocalizedText({
         productId: orderPosition.originalProductId,
-        locale: params.locale?.normalized,
+        locale: params.locale?.baseName,
       });
 
       const positionPricing = modules.orders.positions.pricingSheet(

package/src/templates/order-parser/getOrderSummaryData.ts

@@ -1,7 +1,6 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
-import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
-import { Locale } from '@unchainedshop/types/common.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { Order } from '@unchainedshop/core-orders';
+import { OrderPricingRowCategory } from '@unchainedshop/core-orders';
 import formatPrice from './formatPrice.js';
 import { formatAddress } from './formatAddress.js';
 
@@ -9,7 +8,7 @@ type PriceFormatter = ({ amount, currency }: { amount: number; currency: string
 
 export const getOrderSummaryData = async (
   order: Order,
-  params: { locale?: Locale; useNetPrice?: boolean; format?: PriceFormatter },
+  params: { locale?: Intl.Locale; useNetPrice?: boolean; format?: PriceFormatter },
   context: UnchainedCore,
 ) => {
   const { modules } = context;

package/src/templates/resolveAccountActionTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_URL, EMAIL_WEBSITE_NAME } = process.env;
 

package/src/templates/resolveEnrollmentStatusTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 

package/src/templates/resolveErrorReportTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 import util from 'util';
 
 const {

package/src/templates/resolveForwardDeliveryTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 import { systemLocale } from '@unchainedshop/utils';
 import { transformOrderToText } from './order-parser/index.js';
 

package/src/templates/resolveOrderConfirmationTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;

package/src/templates/resolveOrderRejectionTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;

package/src/templates/resolveQuotationStatusTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { TemplateResolver } from '@unchainedshop/core-messaging';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;