@unchainedshop/api 3.0.0-alpha2 → 3.0.0-alpha4

package/src/resolvers/mutations/countries/removeCountry.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeCountry(
-  root: Root,
+  root: never,
   { countryId }: { countryId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Country } from '@unchainedshop/core-countries';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function updateCountry(
-  root: Root,
+  root: never,
   { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/currencies/createCurrency.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { Currency } from '@unchainedshop/types/currencies.js';
+import { Currency } from '@unchainedshop/core-currencies';
+import { Context } from '../../../types.js';
 
 export default async function createCurrency(
-  root: Root,
+  root: never,
   { currency }: { currency: Currency },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/currencies/removeCurrency.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeCurrency(
-  root: Root,
+  root: never,
   { currencyId }: { currencyId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/currencies/updateCurrency.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Currency } from '@unchainedshop/types/currencies.js';
+import { Context } from '../../../types.js';
+import { Currency } from '@unchainedshop/core-currencies';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function updateCurrency(
-  root: Root,
+  root: never,
   { currency, currencyId }: { currency: Currency; currencyId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/delivery/createDeliveryProvider.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
+import { Context } from '../../../types.js';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 import { ProviderConfigurationInvalid } from '../../../errors.js';
 
 export default async function createDeliveryProvider(
-  root: Root,
+  root: never,
   { deliveryProvider }: { deliveryProvider: DeliveryProvider },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/delivery/removeDeliveryProvider.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeDeliveryProvider(
-  root: Root,
+  root: never,
   { deliveryProviderId }: { deliveryProviderId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/delivery/updateDeliveryProvider.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
+import { Context } from '../../../types.js';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function updateDeliveryProvider(
-  root: Root,
+  root: never,
   params: { deliveryProvider: DeliveryProvider; deliveryProviderId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/enrollments/activateEnrollment.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function activateEnrollment(
-  root: Root,
+  root: never,
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { ProductStatus, ProductTypes } from '@unchainedshop/core-products';
 import {
   ProductNotFoundError,
@@ -9,7 +9,7 @@ import {
 } from '../../../errors.js';
 
 export default async function createEnrollment(
-  root: Root,
+  root: never,
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {

package/src/resolvers/mutations/enrollments/terminateEnrollment.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function terminateEnrollment(
-  root: Root,
+  root: never,
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/enrollments/updateEnrollment.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { EnrollmentPlan, Enrollment } from '@unchainedshop/types/enrollments.js';
-import { Address, Contact } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
+import { EnrollmentPlan, Enrollment } from '@unchainedshop/core-enrollments';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
+import type { Address, Contact } from '@unchainedshop/mongodb';
 
 type UpdateEnrollmentParams = {
   enrollmentId: string;
@@ -15,7 +15,7 @@ type UpdateEnrollmentParams = {
   meta?: any;
 };
 export default async function updateEnrollment(
-  root: Root,
+  root: never,
   params: UpdateEnrollmentParams,
   context: Context,
 ) {

package/src/resolvers/mutations/files/confirmMediaUpload.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { FileUploadExpiredError, FileNotFoundError } from '../../../errors.js';
 
 export default async function confirmMediaUpload(
-  root: Root,
+  root: never,
   { mediaUploadTicketId: fileId, size, type },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/createFilter.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { Filter, FilterInputText } from '@unchainedshop/types/filters.js';
+import { Filter, FilterInputText } from '@unchainedshop/core-filters';
+import { Context } from '../../../types.js';
 
 export default async function createFilter(
-  root: Root,
+  root: never,
   { filter, texts }: { filter: Filter; texts: FilterInputText[] },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/createFilterOption.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
-import { FilterInputText } from '@unchainedshop/types/filters.js';
+import { FilterInputText } from '@unchainedshop/core-filters';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function createFilterOption(
-  root: Root,
+  root: never,
   params: { filterId: string; option: string; texts?: FilterInputText[] },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/removeFilter.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeFilter(
-  root: Root,
+  root: never,
   { filterId }: { filterId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/removeFilterOption.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeFilterOption(
-  root: Root,
+  root: never,
   { filterId, filterOptionValue }: { filterId: string; filterOptionValue: string },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/updateFilter.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { Filter } from '@unchainedshop/types/filters.js';
+import { Filter } from '@unchainedshop/core-filters';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function updateFilter(
-  root: Root,
+  root: never,
   { filter, filterId }: { filter: Filter; filterId: string },
   context: Context,
 ) {
@@ -16,7 +16,5 @@ export default async function updateFilter(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  await modules.filters.update(filterId, filter, context);
-
-  return modules.filters.findFilter({ filterId });
+  return modules.filters.update(filterId, filter, context);
 }

package/src/resolvers/mutations/filters/updateFilterTexts.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function updateFilterTexts(
-  root: Root,
+  root: never,
   params: {
     texts: Array<{ locale: string; title?: string; subtitle?: string }>;
     filterId: string;

package/src/resolvers/mutations/languages/createLanguage.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Context } from '../../../types.js';
+import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 
 export default async function createLanguage(
-  root: Root,
+  root: never,
   { language }: { language: Language },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/languages/removeLanguage.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';
 
 export default async function removeLanguage(
-  root: Root,
+  root: never,
   { languageId }: { languageId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/languages/updateLanguage.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Context } from '../../../types.js';
+import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';
 
 export default async function updateLanguage(
-  root: Root,
+  root: never,
   { language, languageId }: { language: Language; languageId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/orders/addCartDiscount.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
 import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function addCartDiscount(
-  root: Root,
+  root: never,
   { orderId, code }: { orderId?: string; code: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/addCartProduct.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
@@ -9,7 +9,7 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartProduct(
-  root: Root,
+  root: never,
   { orderId, productId, quantity, configuration },
   context: Context,
 ) {
@@ -40,5 +40,5 @@ export default async function addCartProduct(
     context,
   );
   await modules.orders.updateCalculation(order._id, context);
-  return orderPosition;
+  return modules.orders.positions.findOrderPosition({ itemId: orderPosition._id });
 }

package/src/resolvers/mutations/orders/addCartQuotation.ts

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { QuotationStatus } from '@unchainedshop/core-quotations';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Configuration } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
 import {
   QuotationNotFoundError,
   QuotationWrongStatusError,
@@ -12,12 +11,12 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartQuotation(
-  root: Root,
+  root: never,
   params: {
     orderId?: string;
     quotationId: string;
     quantity: number;
-    configuration: Configuration;
+    configuration: Array<{ key: string; value: string }>;
   },
   context: Context,
 ) {
@@ -68,5 +67,5 @@ export default async function addCartQuotation(
     context,
   );
   await modules.orders.updateCalculation(order._id, context);
-  return updatedOrderPosition;
+  return modules.orders.positions.findOrderPosition({ itemId: updatedOrderPosition._id });
 }

package/src/resolvers/mutations/orders/addMultipleCartProducts.ts

@@ -1,6 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Configuration } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
 import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
@@ -9,13 +8,13 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addMultipleCartProducts(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     items: Array<{
       productId: string;
       quantity: number;
-      configuration?: Configuration;
+      configuration?: Array<{ key: string; value: string }>;
     }>;
   },
   context: Context,
@@ -45,29 +44,25 @@ export default async function addMultipleCartProducts(
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   // Reduce is used to wait for each product to be added before processing the next (sequential processing)
-  const updatedOrderPositions = await itemsWithProducts.reduce(
-    async (positionsPromise, { product, quantity, configuration }) => {
-      const positions = await positionsPromise;
-      if (quantity < 1)
-        throw new OrderQuantityTooLowError({
-          quantity,
-          productId: product._id,
-        });
+  await itemsWithProducts.reduce(async (positionsPromise, { product, quantity, configuration }) => {
+    const positions = await positionsPromise;
+    if (quantity < 1)
+      throw new OrderQuantityTooLowError({
+        quantity,
+        productId: product._id,
+      });
 
-      const position = await modules.orders.positions.addProductItem(
-        {
-          quantity,
-          configuration,
-        },
-        { order, product },
-        context,
-      );
-      positions.push(position);
-      return positions;
-    },
-    Promise.resolve([]),
-  );
+    const position = await modules.orders.positions.addProductItem(
+      {
+        quantity,
+        configuration,
+      },
+      { order, product },
+      context,
+    );
+    positions.push(position);
+    return positions;
+  }, Promise.resolve([]));
 
-  await modules.orders.updateCalculation(order._id, context);
-  return updatedOrderPositions;
+  return modules.orders.updateCalculation(order._id, context);
 }

package/src/resolvers/mutations/orders/checkoutCart.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { OrderCheckoutError } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function checkoutCart(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;

package/src/resolvers/mutations/orders/confirmOrder.ts

@@ -1,14 +1,15 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { OrderStatus } from '@unchainedshop/types/orders.js';
+import { Context } from '../../../types.js';
+import { OrderStatus } from '@unchainedshop/core-orders';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function confirmOrder(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/createCart.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNumberAlreadyExistsError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function createCart(
-  root: Root,
+  root: never,
   { orderNumber }: { orderNumber: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/deliverOrder.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { OrderDeliveryStatus } from '@unchainedshop/types/orders.deliveries.js';
+import { Context } from '../../../types.js';
+import { OrderDeliveryStatus } from '@unchainedshop/core-orders';
 import {
   OrderNotFoundError,
   OrderWrongDeliveryStatusError,
@@ -9,7 +9,7 @@ import {
 } from '../../../errors.js';
 
 export default async function deliverOrder(
-  root: Root,
+  root: never,
   { orderId }: { orderId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/emptyCart.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
-  root: Root,
+  root: never,
   { orderId }: { orderId?: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/payOrder.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
+import { Context } from '../../../types.js';
+import { OrderPaymentStatus } from '@unchainedshop/core-orders';
 import {
   OrderNotFoundError,
   OrderWrongPaymentStatusError,
@@ -8,7 +8,7 @@ import {
   InvalidIdError,
 } from '../../../errors.js';
 
-export default async function payOrder(root: Root, { orderId }: { orderId: string }, context: Context) {
+export default async function payOrder(root: never, { orderId }: { orderId: string }, context: Context) {
   const { modules, userId } = context;
 
   log('mutation payOrder', { orderId, userId });

package/src/resolvers/mutations/orders/rejectOrder.ts

@@ -1,14 +1,15 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { OrderStatus } from '@unchainedshop/core-orders';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function rejectOrder(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {
@@ -16,6 +17,7 @@ export default async function rejectOrder(
   const { orderId, ...transactionContext } = params;
 
   log('mutation rejectOrder', { orderId, userId });
+
   if (!orderId) throw new InvalidIdError({ orderId });
 
   const order = await modules.orders.findOrder({ orderId });

package/src/resolvers/mutations/orders/removeCartDiscount.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 import { OrderDiscountNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeCartDiscount(
-  root: Root,
+  root: never,
   { discountId }: { discountId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/removeCartItem.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { OrderItemNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeCartItem(
-  root: Root,
+  root: never,
   { itemId }: { itemId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/removeOrder.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeOrder(
-  root: Root,
+  root: never,
   { orderId }: { orderId: string },
   { modules, userId }: Context,
 ) {