@unchainedshop/api 3.0.0-alpha2 → 3.0.0-alpha4

package/src/resolvers/type/order/order-types.ts

@@ -1,16 +1,16 @@
 import crypto from 'crypto';
-import { Context } from '@unchainedshop/types/api.js';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Currency } from '@unchainedshop/types/currencies.js';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
-import { Enrollment } from '@unchainedshop/types/enrollments.js';
-import { Order as OrderType } from '@unchainedshop/types/orders.js';
-import { OrderDelivery } from '@unchainedshop/types/orders.deliveries.js';
-import { OrderDiscount } from '@unchainedshop/types/orders.discounts.js';
-import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
-import { OrderPosition } from '@unchainedshop/types/orders.positions.js';
-import { OrderPrice } from '@unchainedshop/types/orders.pricing.js';
-import { User } from '@unchainedshop/types/user.js';
+import { Context } from '@unchainedshop/api';
+import { Country } from '@unchainedshop/core-countries';
+import { Currency } from '@unchainedshop/core-currencies';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
+import { Enrollment } from '@unchainedshop/core-enrollments';
+import { Order as OrderType } from '@unchainedshop/core-orders';
+import { OrderDelivery } from '@unchainedshop/core-orders';
+import { OrderDiscount } from '@unchainedshop/core-orders';
+import { OrderPayment } from '@unchainedshop/core-orders';
+import { OrderPosition } from '@unchainedshop/core-orders';
+import { OrderPrice } from '@unchainedshop/core-orders';
+import { User } from '@unchainedshop/core-users';
 
 export const Order = {
   async supportedDeliveryProviders(

package/src/resolvers/type/payment/payment-credentials-types.ts

@@ -1,5 +1,17 @@
-import { PaymentCredentialsHelperTypes } from '@unchainedshop/types/payments.js';
+import { Context } from '@unchainedshop/api';
+import {
+  PaymentCredentials as PaymentCredentialsType,
+  PaymentProvider,
+} from '@unchainedshop/core-payment';
+import { User } from '@unchainedshop/core-users';
 
+export type HelperType<P, T> = (credentials: PaymentCredentialsType, params: P, context: Context) => T;
+
+export interface PaymentCredentialsHelperTypes {
+  user: HelperType<never, Promise<User>>;
+  paymentProvider: HelperType<never, Promise<PaymentProvider>>;
+  isValid: HelperType<never, Promise<boolean>>;
+}
 export const PaymentCredentials: PaymentCredentialsHelperTypes = {
   async user(obj, _, { modules }) {
     return modules.users.findUserById(obj.userId);

package/src/resolvers/type/payment/payment-provider-types.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto';
-import { Context } from '@unchainedshop/types/api.js';
-import { PaymentError, PaymentProvider as PaymentProviderType } from '@unchainedshop/types/payments.js';
+import { Context } from '@unchainedshop/api';
+import { PaymentError, PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
 import { PaymentPricingDirector } from '@unchainedshop/core-payment';
 
 export interface PaymentProviderHelperTypes {

package/src/resolvers/type/product/product-assortment-path-types.ts

@@ -1,4 +1,15 @@
-import { ProductAssortmentPathHelperTypes } from '@unchainedshop/types/products.js';
+import { Product } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
+import { AssortmentPathLink, AssortmentProduct } from '@unchainedshop/core-assortments';
+
+export type HelperType<P, T> = (product: Product, params: P, context: Context) => T;
+export interface ProductAssortmentPathHelperTypes {
+  assortmentProduct: (
+    data: { assortmentId: string; productId: string; links: Array<AssortmentPathLink> },
+    _: never,
+    context: Context,
+  ) => Promise<AssortmentProduct>;
+}
 
 export const ProductAssortmentPath: ProductAssortmentPathHelperTypes = {
   assortmentProduct: async ({ assortmentId, productId }, _, { loaders }) => {

package/src/resolvers/type/product/product-bundle-item-types.ts

@@ -1,4 +1,9 @@
-import { ProductBundleItemHelperTypes } from '@unchainedshop/types/products.js';
+import { Product, ProductBundleItem as ProductBundleItemType } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
+
+export interface ProductBundleItemHelperTypes {
+  product: (bundleItem: ProductBundleItemType, _: never, context: Context) => Promise<Product>;
+}
 
 export const ProductBundleItem: ProductBundleItemHelperTypes = {
   product: async (productItem, _, { loaders }) => {

package/src/resolvers/type/product/product-bundle-types.ts

@@ -1,4 +1,4 @@
-import { ProductBundleItem } from '@unchainedshop/types/products.js';
+import { ProductBundleItem } from '@unchainedshop/core-products';
 import { Product } from './product-types.js';
 
 export const BundleProduct = {

package/src/resolvers/type/product/product-catalog-price-types.ts

@@ -1,4 +1,22 @@
-import { ProductCatalogPriceHelperTypes } from '@unchainedshop/types/products.js';
+import { Country } from '@unchainedshop/core-countries';
+import { Currency } from '@unchainedshop/core-currencies';
+import { ProductPrice } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
+
+export type ProductCatalogHelperType<P, T> = (
+  productPrice: ProductPrice,
+  params: P,
+  context: Context,
+) => T;
+
+export interface ProductCatalogPriceHelperTypes {
+  isTaxable: ProductCatalogHelperType<never, boolean>;
+
+  isNetPrice: ProductCatalogHelperType<never, boolean>;
+
+  country: ProductCatalogHelperType<never, Promise<Country>>;
+  currency: ProductCatalogHelperType<never, Promise<Currency>>;
+}
 
 export const ProductCatalogPrice: ProductCatalogPriceHelperTypes = {
   isTaxable: ({ isTaxable }) => {

package/src/resolvers/type/product/product-configurable-types.ts

@@ -3,9 +3,9 @@ import {
   ProductAssignment,
   ProductConfiguration,
   ProductPriceRange,
-} from '@unchainedshop/types/products.js';
-import { Context } from '@unchainedshop/types/api.js';
-import { ProductVariation } from '@unchainedshop/types/products.variations.js';
+} from '@unchainedshop/core-products';
+import { Context } from '@unchainedshop/api';
+import { ProductVariation } from '@unchainedshop/core-products';
 import { Product } from './product-types.js';
 
 export const ConfigurableProduct = {

package/src/resolvers/type/product/product-discount.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto';
-import { Context } from '@unchainedshop/types/api.js';
-import { ProductDiscount as ProductDiscountType } from '@unchainedshop/types/products.js';
+import { Context } from '@unchainedshop/api';
+import { ProductDiscount as ProductDiscountType } from '@unchainedshop/core-products';
 
 type HelperType<T> = (product: ProductDiscountType, _: never, context: Context) => T;
 

package/src/resolvers/type/product/product-media-types.ts

@@ -1,11 +1,20 @@
-import { ProductMediaHelperTypes } from '@unchainedshop/types/products.media.js';
+import { Context } from '@unchainedshop/api';
+import { File } from '@unchainedshop/core-files';
+import { ProductMedia as ProductMediaType, ProductMediaText } from '@unchainedshop/core-products';
+
+export type HelperType<P, T> = (productMedia: ProductMediaType, params: P, context: Context) => T;
+
+export interface ProductMediaHelperTypes {
+  texts: HelperType<{ forceLocale?: string }, Promise<ProductMediaText>>;
+  file: HelperType<never, Promise<File>>;
+}
 
 export const ProductMedia: ProductMediaHelperTypes = {
   async texts(obj, { forceLocale }, requestContext) {
     const { localeContext, loaders } = requestContext;
     return loaders.productMediaTextLoader.load({
       productMediaId: obj._id,
-      locale: forceLocale || localeContext.normalized,
+      locale: forceLocale || localeContext.baseName,
     });
   },
 

package/src/resolvers/type/product/product-plan-types.ts

@@ -1,5 +1,9 @@
-import { ProductPrice, Product as ProductType } from '@unchainedshop/types/products.js';
-import { Context } from '@unchainedshop/types/api.js';
+import {
+  ProductConfiguration,
+  ProductPrice,
+  Product as ProductType,
+} from '@unchainedshop/core-products';
+import { Context } from '@unchainedshop/api';
 import { Product } from './product-types.js';
 
 export const PlanProduct = {
@@ -25,7 +29,13 @@ export const PlanProduct = {
       currency: forcedCurrencyCode,
       quantity,
       useNetPrice,
-    }: { quantity?: number; currency?: string; useNetPrice?: boolean },
+      configuration,
+    }: {
+      quantity?: number;
+      currency?: string;
+      useNetPrice?: boolean;
+      configuration?: Array<ProductConfiguration>;
+    },
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { countryContext, modules } = requestContext;
@@ -33,7 +43,14 @@ export const PlanProduct = {
 
     return modules.products.prices.userPrice(
       obj,
-      { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice },
+      {
+        quantity,
+        userId: requestContext.userId,
+        currency,
+        country: countryContext,
+        useNetPrice,
+        configuration,
+      },
       requestContext,
     );
   },

package/src/resolvers/type/product/product-review-types.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { Product } from '@unchainedshop/types/products.js';
+import { Context } from '@unchainedshop/api';
+import { Product } from '@unchainedshop/core-products';
 import {
   ProductReview as ProductReviewType,
   ProductReviewVoteType,
   ProductVote,
-} from '@unchainedshop/types/products.reviews.js';
-import { User } from '@unchainedshop/types/user.js';
+} from '@unchainedshop/core-products';
+import { User } from '@unchainedshop/core-users';
 
 type HelperType<P, T> = (product: ProductReviewType, params: P, context: Context) => T;
 

package/src/resolvers/type/product/product-simple-types.ts

@@ -1,8 +1,8 @@
-import { Product, ProductSupply } from '@unchainedshop/types/products.js';
-import { WarehousingContext, WarehousingProvider } from '@unchainedshop/types/warehousing.js';
-import { Context } from '@unchainedshop/types/api.js';
+import { Product, ProductSupply } from '@unchainedshop/core-products';
+import { WarehousingContext, WarehousingProvider } from '@unchainedshop/core-warehousing';
+import { Context } from '@unchainedshop/api';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { PlanProduct } from './product-plan-types.js';
 
 export const SimpleProduct = {

package/src/resolvers/type/product/product-tokenized-types.ts

@@ -2,10 +2,10 @@ import {
   Product,
   ProductContractConfiguration,
   ProductContractStandard,
-} from '@unchainedshop/types/products.js';
-import { WarehousingContext, WarehousingProvider } from '@unchainedshop/types/warehousing.js';
-import { Context } from '@unchainedshop/types/api.js';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
+} from '@unchainedshop/core-products';
+import { WarehousingContext, WarehousingProvider } from '@unchainedshop/core-warehousing';
+import { Context } from '@unchainedshop/api';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { PlanProduct } from './product-plan-types.js';
 import { checkAction } from '../../../acl.js';
 import { actions } from '../../../roles/index.js';

package/src/resolvers/type/product/product-types.ts

@@ -1,10 +1,11 @@
-import { ProductText, Product as ProductType } from '@unchainedshop/types/products.js';
+import { ProductText, Product as ProductType } from '@unchainedshop/core-products';
 import { ProductStatus, ProductTypes } from '@unchainedshop/core-products';
 import { objectInvert } from '@unchainedshop/utils';
-import { Context, SortOption } from '@unchainedshop/types/api.js';
-import { AssortmentPathLink } from '@unchainedshop/types/assortments.js';
-import { ProductMedia } from '@unchainedshop/types/products.media.js';
-import { ProductReview } from '@unchainedshop/types/products.reviews.js';
+import { SortOption } from '@unchainedshop/utils';
+import { AssortmentPathLink } from '@unchainedshop/core-assortments';
+import { ProductMedia } from '@unchainedshop/core-products';
+import { ProductReview } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
 
 export const Product = {
   __resolveType: (product: ProductType): string => {
@@ -125,7 +126,7 @@ export const Product = {
     const { localeContext, loaders } = requestContext;
     return loaders.productTextLoader.load({
       productId: product._id,
-      locale: forceLocale || localeContext.normalized,
+      locale: forceLocale || localeContext.baseName,
     });
   },
 };

package/src/resolvers/type/product/product-variation-assignment-types.ts

@@ -1,4 +1,17 @@
-import { ProductVariationAssignmentHelperTypes } from '@unchainedshop/types/products.variations.js';
+import { Context } from '@unchainedshop/api';
+import { Product, ProductAssignment, ProductConfiguration } from '@unchainedshop/core-products';
+
+export type AssignmentHelperType<T> = (
+  data: { product: Product; assignment: ProductAssignment },
+  _: never,
+  context: Context,
+) => T;
+
+export interface ProductVariationAssignmentHelperTypes {
+  _id: AssignmentHelperType<string>;
+  vectors: AssignmentHelperType<Array<{ product: Product } & ProductConfiguration>>;
+  product: AssignmentHelperType<Promise<Product>>;
+}
 
 export const ProductVariationAssignment: ProductVariationAssignmentHelperTypes = {
   _id: ({ product, assignment }) => {

package/src/resolvers/type/product/product-variation-assignment-vector.ts

@@ -1,4 +1,18 @@
-import { ProductVariationAssignmentVectorHelperTypes } from '@unchainedshop/types/products.variations.js';
+import { Context } from '@unchainedshop/api';
+import { Product, ProductConfiguration } from '@unchainedshop/core-products';
+import { ProductVariation } from '@unchainedshop/core-products';
+
+export type AssignmentVectorHelperType<T> = (
+  data: { product: Product } & ProductConfiguration,
+  _: never,
+  context: Context,
+) => T;
+
+export interface ProductVariationAssignmentVectorHelperTypes {
+  _id: AssignmentVectorHelperType<string>;
+  option: AssignmentVectorHelperType<Promise<{ _id: string; productVariationOption: string }>>;
+  variation: AssignmentVectorHelperType<Promise<ProductVariation>>;
+}
 
 export const ProductVariationAssignmentVector: ProductVariationAssignmentVectorHelperTypes = {
   _id: ({ product, key, value }) => `${product._id}:${key}=${value}`,

package/src/resolvers/type/product/product-variation-option-types.ts

@@ -1,5 +1,17 @@
-import { ProductVariationOptionHelperTypes } from '@unchainedshop/types/products.variations.js';
+import { Context } from '@unchainedshop/api';
+import { ProductVariationText } from '@unchainedshop/core-products';
 
+export type OptionHelperType<P, T> = (
+  option: { _id: string; productVariationOption: string },
+  params: P,
+  context: Context,
+) => T;
+
+export interface ProductVariationOptionHelperTypes {
+  _id: OptionHelperType<never, string>;
+  texts: OptionHelperType<{ forceLocale?: string }, Promise<ProductVariationText>>;
+  value: OptionHelperType<never, string>;
+}
 export const ProductVariationOption: ProductVariationOptionHelperTypes = {
   _id: (obj) => {
     return `${obj._id}:${obj.productVariationOption}`;
@@ -10,7 +22,7 @@ export const ProductVariationOption: ProductVariationOptionHelperTypes = {
 
   texts: async (obj, { forceLocale }, { modules, localeContext }) => {
     return modules.products.variations.texts.findLocalizedVariationText({
-      locale: forceLocale || localeContext.normalized,
+      locale: forceLocale || localeContext.baseName,
       productVariationId: obj._id,
       productVariationOptionValue: obj.productVariationOption,
     });

package/src/resolvers/type/product/product-variation-types.ts

@@ -1,5 +1,25 @@
-import { ProductVariationHelperTypes } from '@unchainedshop/types/products.variations.js';
+import { Context } from '@unchainedshop/api';
+import {
+  ProductVariation as ProductVariationType,
+  ProductVariationText,
+} from '@unchainedshop/core-products';
 
+export type HelperType<P, T> = (
+  productVariation: ProductVariationType,
+  params: P,
+  context: Context,
+) => T;
+
+export interface ProductVariationHelperTypes {
+  options: HelperType<
+    never,
+    Array<{
+      _id: string;
+      productVariationOption: string;
+    }>
+  >;
+  texts: HelperType<{ forceLocale?: string }, Promise<ProductVariationText>>;
+}
 export const ProductVariation: ProductVariationHelperTypes = {
   options: (obj, _, { modules }) => {
     return (obj.options || []).map((option) => modules.products.variations.option(obj, option));
@@ -8,7 +28,7 @@ export const ProductVariation: ProductVariationHelperTypes = {
   texts: async (obj, { forceLocale }, { modules, localeContext }) => {
     return modules.products.variations.texts.findLocalizedVariationText({
       productVariationId: obj._id,
-      locale: forceLocale || localeContext.normalized,
+      locale: forceLocale || localeContext.baseName,
     });
   },
 };

package/src/resolvers/type/quotation-types.ts

@@ -1,9 +1,9 @@
-import { Quotation as QuotationType } from '@unchainedshop/types/quotations.js';
-import { Context } from '@unchainedshop/types/api.js';
-import { User } from '@unchainedshop/types/user.js';
-import { Product } from '@unchainedshop/types/products.js';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Currency } from '@unchainedshop/types/currencies.js';
+import { Quotation as QuotationType } from '@unchainedshop/core-quotations';
+import { Context } from '@unchainedshop/api';
+import { User } from '@unchainedshop/core-users';
+import { Product } from '@unchainedshop/core-products';
+import { Country } from '@unchainedshop/core-countries';
+import { Currency } from '@unchainedshop/core-currencies';
 
 type HelperType<P, T> = (quotation: QuotationType, params: P, context: Context) => T;
 

package/src/resolvers/type/shop-types.ts

@@ -1,6 +1,6 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Context } from '@unchainedshop/api';
+import { Country } from '@unchainedshop/core-countries';
+import { Language } from '@unchainedshop/core-languages';
 import { checkAction } from '../../acl.js';
 import { allRoles, actions } from '../../roles/index.js';
 

package/src/resolvers/type/stock-types.ts

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
-import { Product } from '@unchainedshop/types/products.js';
-import { WarehousingProvider } from '@unchainedshop/types/warehousing.js';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
+import { Product } from '@unchainedshop/core-products';
+import { WarehousingProvider } from '@unchainedshop/core-warehousing';
 
 export const Stock = {
   _id: (params: {

package/src/resolvers/type/token-types.ts

@@ -1,12 +1,9 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { TokenStatus, TokenSurrogate } from '@unchainedshop/types/warehousing.js';
-import { WorkStatus } from '@unchainedshop/types/worker.js';
-import localePkg from 'locale';
+import { Context } from '@unchainedshop/api';
+import { TokenStatus, TokenSurrogate } from '@unchainedshop/core-warehousing';
+import { WorkStatus } from '@unchainedshop/core-worker';
 import { checkAction } from '../../acl.js';
 import { actions } from '../../roles/index.js';
 
-const { Locale } = localePkg;
-
 export const Token = {
   product: async (token: TokenSurrogate, params: never, { modules }: Context) => {
     return modules.products.findProduct({ productId: token.productId });
@@ -41,7 +38,7 @@ export const Token = {
       {
         token,
         product,
-        locale: new Locale(forceLocale),
+        locale: new Intl.Locale(forceLocale),
         referenceDate: new Date(),
       },
       context,

package/src/resolvers/type/user-types.ts

@@ -1,13 +1,11 @@
-import { Context, SortOption } from '@unchainedshop/types/api.js';
-import { Bookmark } from '@unchainedshop/types/bookmarks.js';
-import { Contact } from '@unchainedshop/types/common.js';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Enrollment, EnrollmentStatus } from '@unchainedshop/types/enrollments.js';
-import { File } from '@unchainedshop/types/files.js';
-import { Language } from '@unchainedshop/types/languages.js';
-import { Order } from '@unchainedshop/types/orders.js';
-import { PaymentCredentials } from '@unchainedshop/types/payments.js';
-import { Quotation } from '@unchainedshop/types/quotations.js';
+import type { Bookmark } from '@unchainedshop/core-bookmarks';
+import { SortOption } from '@unchainedshop/utils';
+import { Enrollment, EnrollmentStatus } from '@unchainedshop/core-enrollments';
+import { File } from '@unchainedshop/core-files';
+import { Language } from '@unchainedshop/core-languages';
+import { Order, OrderStatus } from '@unchainedshop/core-orders';
+import { PaymentCredentials } from '@unchainedshop/core-payment';
+import { Quotation } from '@unchainedshop/core-quotations';
 import {
   Email,
   User as UserType,
@@ -15,13 +13,15 @@ import {
   Web3Address,
   WebAuthnCredentials,
   PushSubscription,
-} from '@unchainedshop/types/user.js';
-import type { Locale } from 'locale';
-import { TokenSurrogate } from '@unchainedshop/types/warehousing.js';
+} from '@unchainedshop/core-users';
+import { TokenSurrogate } from '@unchainedshop/core-warehousing';
 import { Roles, permissions } from '@unchainedshop/roles';
-import { ProductReview } from '@unchainedshop/types/products.reviews.js';
+import { ProductReview } from '@unchainedshop/core-products';
 import { checkAction, checkTypeResolver } from '../../acl.js';
 import { actions } from '../../roles/index.js';
+import { Context } from '../../types.js';
+import type { Contact } from '@unchainedshop/mongodb';
+import type { Country } from '@unchainedshop/core-countries';
 
 type HelperType<P, T> = (user: UserType, params: P, context: Context) => Promise<T>;
 
@@ -30,10 +30,10 @@ export interface UserHelperTypes {
   created: HelperType<any, Date>;
   updated: HelperType<any, Date>;
   deleted: HelperType<any, Date>;
-  avatar: HelperType<{ localeContext: Locale }, File>;
+  avatar: HelperType<{ localeContext: Intl.Locale }, File>;
   bookmarks: HelperType<any, Array<Bookmark>>;
   cart: HelperType<{ orderNumber?: string }, Order>;
-  country: HelperType<{ localeContext: Locale }, Country>;
+  country: HelperType<{ localeContext: Intl.Locale }, Country>;
   emails: HelperType<any, Array<string>>;
   enrollments: HelperType<
     {
@@ -47,19 +47,18 @@ export interface UserHelperTypes {
   >;
   isGuest: HelperType<any, boolean>;
   isInitialPassword: HelperType<any, boolean>;
-  language: HelperType<{ localeContext: Locale }, Language>;
+  language: HelperType<{ localeContext: Intl.Locale }, Language>;
   lastBillingAddress: HelperType<any, UserType['lastBillingAddress']>;
   lastContact: HelperType<any, Contact>;
   lastLogin: HelperType<any, UserType['lastLogin']>;
   allowedActions: HelperType<any, Array<string>>;
-  // locale: HelperType<{ localeContext: Locale }, Locale>;
   name: HelperType<any, string>;
   orders: HelperType<
     {
       includeCarts: boolean;
       sort?: Array<SortOption>;
       queryString?: string;
-      status?: string;
+      status?: OrderStatus[];
       userId?: string;
       limit?: number;
       offset?: number;
@@ -174,7 +173,10 @@ export const User: UserHelperTypes = {
 
   async country(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserCountry(user, context);
+    const userLocale = context.modules.users.userLocale(user);
+    return context.modules.countries.findCountry({
+      isoCode: userLocale.region?.toUpperCase(),
+    });
   },
 
   async enrollments(user, params, context) {
@@ -187,7 +189,10 @@ export const User: UserHelperTypes = {
 
   language: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserLanguage(user, context);
+    const userLocale = context.modules.users.userLocale(user);
+    return context.modules.languages.findLanguage({
+      isoCode: userLocale.language,
+    });
   },
 
   allowedActions: async (user, params, context) => {

package/src/resolvers/type/warehousing-provider-types.ts

@@ -1,4 +1,17 @@
-import { WarehousingProviderHelperTypes } from '@unchainedshop/types/warehousing.js';
+import {
+  WarehousingError,
+  WarehousingInterface,
+  WarehousingProvider as WarehousingProviderType,
+} from '@unchainedshop/core-warehousing';
+import { Context } from '../../types.js';
+
+export type HelperType<P, T> = (provider: WarehousingProviderType, params: P, context: Context) => T;
+
+export interface WarehousingProviderHelperTypes {
+  configurationError: HelperType<never, Promise<WarehousingError>>;
+  interface: HelperType<never, WarehousingInterface>;
+  isActive: HelperType<never, Promise<boolean>>;
+}
 
 export const WarehousingProvider: WarehousingProviderHelperTypes = {
   interface(obj, _, context) {

package/src/resolvers/type/webauthn-credentials-types.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { WebAuthnCredentials as WebAuthnCredentialsTypes } from '@unchainedshop/types/user.js';
+import { Context } from '@unchainedshop/api';
+import { WebAuthnCredentials as WebAuthnCredentialsTypes } from '@unchainedshop/core-users';
 
 type HelperType<P, T> = (
   credentials: WebAuthnCredentialsTypes,

package/src/resolvers/type/work-types.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { Work as WorkType } from '@unchainedshop/types/worker.js';
+import { Context } from '@unchainedshop/api';
+import { Work as WorkType } from '@unchainedshop/core-worker';
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
 
 type HelperType<P, T> = (work: WorkType, params: P, context: Context) => T;

package/src/roles/all.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 
 export const all = (role, actions) => {
   const isInLoginMutationResponse = (root) => {
@@ -92,6 +92,7 @@ export const all = (role, actions) => {
   role.allow(actions.viewQuotation, () => false);
   role.allow(actions.viewEnrollment, () => false);
   role.allow(actions.viewTokens, () => false);
+  role.allow(actions.viewStatistics, () => false);
 
   // special case: when doing a login mutation, the user is not logged in technically yet,
   // but should be able to see user data of the user that is about to be logged in

package/src/roles/index.ts

@@ -112,6 +112,7 @@ const actions: Record<string, string> = [
   'viewUserProductReviews',
   'heartbeat',
   'confirmMediaUpload',
+  'viewStatistics',
 ].reduce((oldValue, actionValue) => {
   const newValue = oldValue;
   newValue[actionValue] = actionValue;

package/src/roles/loggedIn.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { User } from '@unchainedshop/types/user.js';
+import { Context } from '@unchainedshop/api';
+import { User } from '@unchainedshop/core-users';
 
 export const loggedIn = (role: any, actions: Record<string, string>) => {
   const isMyself = (user: User, params: { userId?: string } = {}, ownUser: { userId?: string } = {}) => {
@@ -193,8 +193,6 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
     return credentials.userId === userId;
   };
 
-  role.allow(actions.viewEvent, false);
-  role.allow(actions.viewEvents, false);
   role.allow(actions.viewUser, isMyself);
   role.allow(actions.viewUserRoles, isMyself);
   role.allow(actions.viewUserOrders, isMyself);