@unchainedshop/api 3.0.0-alpha2 → 3.0.0-alpha3

package/src/resolvers/queries/filters/translatedFilterTexts.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 export default async function translatedFilterTexts(
-  root: Root,
+  root: never,
   { filterId, filterOptionValue }: { filterId: string; filterOptionValue?: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/index.ts

@@ -65,9 +65,12 @@ import token from './warehousing/token.js';
 import tokens from './warehousing/tokens.js';
 import work from './worker/work.js';
 import workQueue from './worker/workQueue.js';
+import workStatistics from './worker/workStatistics.js';
 import workQueueCount from './worker/workQueueCount.js';
 import validateResetPasswordToken from './users/validateResetPasswordToken.js';
 import validateVerifyEmailToken from './users/validateVerifyEmailToken.js';
+import eventStatistics from './events/eventStatistics.js';
+import orderStatistics from './orders/orderStatistics.js';
 
 export default {
   me,
@@ -137,4 +140,7 @@ export default {
   eventsCount: acl(actions.viewEvents)(eventsCount),
   validateResetPasswordToken: acl(actions.resetPassword)(validateResetPasswordToken),
   validateVerifyEmailToken: acl(actions.verifyEmail)(validateVerifyEmailToken),
+  workStatistics: acl(actions.viewStatistics)(workStatistics),
+  eventStatistics: acl(actions.viewStatistics)(eventStatistics),
+  orderStatistics: acl(actions.viewStatistics)(orderStatistics),
 };

package/src/resolvers/queries/languages/language.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 } from '../../../errors.js';
 
 export default async function language(
-  root: Root,
+  root: never,
   { languageId }: { languageId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/languages/languages.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
-import { LanguageQuery } from '@unchainedshop/types/languages.js';
+import { SortOption } from '@unchainedshop/utils';
+import { LanguageQuery } from '@unchainedshop/core-languages';
+import { Context } from '../../../types.js';
 
 export default async function languages(
-  root: Root,
+  root: never,
   params: LanguageQuery & { limit: number; offset: number; sort?: Array<SortOption> },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/languages/languagesCount.ts

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

package/src/resolvers/queries/orders/order.ts

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

package/src/resolvers/queries/orders/orderStatistics.ts

@@ -0,0 +1,14 @@
+import { log } from '@unchainedshop/logger';
+import { Context } from '../../../types.js';
+
+export default async function orderStatistics(
+  root: never,
+  params: { from?: Date; to?: Date },
+  { modules, userId }: Context,
+) {
+  log(`query orderStatistics ${params.from || ''} ${params.to || ''}`, {
+    userId,
+  });
+
+  return modules.orders.getReport(params);
+}

package/src/resolvers/queries/orders/orders.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context, SortOption } from '@unchainedshop/types/api.js';
-import { OrderQuery } from '@unchainedshop/types/orders.js';
+import { SortOption } from '@unchainedshop/utils';
+import { OrderQuery } from '@unchainedshop/core-orders';
+import { Context } from '../../../types.js';
 
 export default async function orders(
-  root: Root,
+  root: never,
   params: OrderQuery & { limit?: number; offset?: number; sort?: Array<SortOption> },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/orders/ordersCount.ts

@@ -1,8 +1,12 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { OrderQuery } from '@unchainedshop/types/orders.js';
+import { OrderQuery } from '@unchainedshop/core-orders';
+import { Context } from '../../../types.js';
 
-export default async function ordersCount(root: Root, params: OrderQuery, { modules, userId }: Context) {
+export default async function ordersCount(
+  root: never,
+  params: OrderQuery,
+  { modules, userId }: Context,
+) {
   log(`query ordersCount: ${params.includeCarts ? 'includeCart' : ''}`, { userId });
 
   return modules.orders.count(params);

package/src/resolvers/queries/payment/paymentInterfaces.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { PaymentProviderType } from '@unchainedshop/types/payments.js';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { PaymentProviderType } from '@unchainedshop/core-payment';
+import { Context } from '../../../types.js';
 
 export default async function paymentInterfaces(
-  root: Root,
+  root: never,
   { type }: { type: PaymentProviderType },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/payment/paymentProvider.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 } from '../../../errors.js';
 
 export default async function paymentProvider(
-  root: Root,
+  root: never,
   { paymentProviderId }: { paymentProviderId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/payment/paymentProviders.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
 import { mongodb } from '@unchainedshop/mongodb';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { PaymentProvider } from '@unchainedshop/types/payments.js';
+import { Context } from '../../../types.js';
+import { PaymentProvider } from '@unchainedshop/core-payment';
 
 export default async function paymentProviders(
-  root: Root,
+  root: never,
   params: mongodb.Filter<PaymentProvider>,
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/payment/paymentProvidersCount.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
 import { mongodb } from '@unchainedshop/mongodb';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { PaymentProvider } from '@unchainedshop/types/payments.js';
+import { Context } from '../../../types.js';
+import { PaymentProvider } from '@unchainedshop/core-payment';
 
 export default async function paymentProvidersCount(
-  root: Root,
+  root: never,
   params: mongodb.Filter<PaymentProvider>,
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/products/product.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 } from '../../../errors.js';
 
 export default async function product(
-  root: Root,
+  root: never,
   { productId, slug }: { productId?: string; slug?: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/products/productCatalogPrices.ts

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

package/src/resolvers/queries/products/productReview.ts

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

package/src/resolvers/queries/products/productReviews.ts

@@ -1,8 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context, SortOption } from '@unchainedshop/types/api.js';
+import { SortOption } from '@unchainedshop/utils';
+import { Context } from '../../../types.js';
 
 export default async function productReviews(
-  root: Root,
+  root: never,
   params: {
     limit: number;
     offset: number;

package/src/resolvers/queries/products/productReviewsCount.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { ProductReviewQuery } from '@unchainedshop/types/products.reviews.js';
+import { ProductReviewQuery } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
 
 export default async function productReviewsCount(
-  root: Root,
+  root: never,
   params: ProductReviewQuery,
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/products/products.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
-import { ProductQuery } from '@unchainedshop/types/products.js';
+import { SortOption } from '@unchainedshop/utils';
+import { ProductQuery } from '@unchainedshop/core-products';
+import { Context } from '../../../types.js';
 
 export default async function products(
-  root: Root,
+  root: never,
   params: ProductQuery & {
     sort: Array<SortOption>;
     limit: number;

package/src/resolvers/queries/products/productsCount.ts

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

package/src/resolvers/queries/products/translatedProductMediaTexts.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 export default async function translatedProductMediaTexts(
-  root: Root,
+  root: never,
   { productMediaId }: { productMediaId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/products/translatedProductTexts.ts

@@ -1,8 +1,8 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 
 export default async function translatedProductTexts(
-  root: Root,
+  root: never,
   { productId }: { productId: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/products/translatedProductVariationTexts.ts

@@ -1,8 +1,8 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 
 export default async function translatedProductVariationTexts(
-  root: Root,
+  root: never,
   params: { productVariationId: string; productVariationOptionValue?: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/quotations/quotation.ts

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

package/src/resolvers/queries/quotations/quotations.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
-import { QuotationQuery } from '@unchainedshop/types/quotations.js';
+import { SortOption } from '@unchainedshop/utils';
+import { QuotationQuery } from '@unchainedshop/core-quotations';
+import { Context } from '../../../types.js';
 
 export default async function quotations(
-  root: Root,
+  root: never,
   params: QuotationQuery & { limit?: number; offset?: number; sort?: Array<SortOption> },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/quotations/quotationsCount.ts

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

package/src/resolvers/queries/shopInfo.ts

@@ -1,8 +1,8 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../types.js';
 import { log } from '@unchainedshop/logger';
 
 export default function shopInfo(
-  root: Root,
+  root: never,
   _: never,
   context: Context,
 ): {
@@ -20,7 +20,7 @@ export default function shopInfo(
       try {
         const parsed = JSON.parse(process.env.EXTERNAL_LINKS);
         return parsed;
-      } catch (e) {
+      } catch {
         return [];
       }
     },

package/src/resolvers/queries/users/me.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
-export default async function me(root: Root, params: any, { userId, user, remoteAddress }: Context) {
+export default async function me(root: never, params: any, { userId, user, remoteAddress }: Context) {
   log(`query me ${remoteAddress}`, { userId });
 
   return user;

package/src/resolvers/queries/users/user.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 export default async function user(
-  root: Root,
+  root: never,
   params: { userId?: string },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/users/users.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
-import { UserQuery } from '@unchainedshop/types/user.js';
+import { SortOption } from '@unchainedshop/utils';
+import { UserQuery } from '@unchainedshop/core-users';
+import { Context } from '../../../types.js';
 
 export default async function users(
-  root: Root,
+  root: never,
   params: UserQuery & {
     limit?: number;
     offset?: number;

package/src/resolvers/queries/users/usersCount.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { UserQuery } from '@unchainedshop/types/user.js';
+import { Context } from '../../../types.js';
+import { UserQuery } from '@unchainedshop/core-users';
 
-export default async function usersCount(root: Root, params: UserQuery, { modules, userId }: Context) {
+export default async function usersCount(root: never, params: UserQuery, { modules, userId }: Context) {
   log(`query usersCount ${params.queryString || ''} ${params.includeGuests ? 'includeGuests' : ''}`, {
     userId,
   });

package/src/resolvers/queries/users/validateResetPasswordToken.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 export default async function validateResetPasswordToken(
-  root: Root,
+  root: never,
   params: { token: string },
   context: Context,
 ) {

package/src/resolvers/queries/users/validateVerifyEmailToken.ts

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

package/src/resolvers/queries/warehousing/token.ts

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

package/src/resolvers/queries/warehousing/tokens.ts

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 export default async function tokens(
-  root: Root,
+  root: never,
   {
     limit = 10,
     offset = 0,

package/src/resolvers/queries/warehousing/warehousingInterfaces.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { WarehousingProviderType } from '@unchainedshop/types/warehousing.js';
+import { Context } from '../../../types.js';
+import { WarehousingProviderType } from '@unchainedshop/core-warehousing';
 import { log } from '@unchainedshop/logger';
 
 export default async function warehousingInterfaces(
-  root: Root,
+  root: never,
   params: { type: WarehousingProviderType },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/warehousing/warehousingProvider.ts

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

package/src/resolvers/queries/warehousing/warehousingProviders.ts

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

package/src/resolvers/queries/warehousing/warehousingProvidersCount.ts

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

package/src/resolvers/queries/worker/activeWorkTypes.ts

@@ -1,7 +1,7 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 
-export default async function activeWorkTypes(root: Root, _: any, { modules, userId }: Context) {
+export default async function activeWorkTypes(root: never, _: any, { modules, userId }: Context) {
   log(`query activeWorkTypes  `, { userId });
 
   return modules.worker.activeWorkTypes();

package/src/resolvers/queries/worker/work.ts

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

package/src/resolvers/queries/worker/workQueue.ts

@@ -1,9 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context, SortOption } from '@unchainedshop/types/api.js';
-import { WorkStatus } from '@unchainedshop/types/worker.js';
+import { SortOption } from '@unchainedshop/utils';
+import { WorkStatus } from '@unchainedshop/core-worker';
+import { Context } from '../../../types.js';
 
 export default async function workQueue(
-  root: Root,
+  root: never,
   {
     limit,
     offset,

package/src/resolvers/queries/worker/workQueueCount.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { WorkQueueQuery } from '@unchainedshop/types/worker.js';
+import { Context } from '../../../types.js';
+import { WorkQueueQuery } from '@unchainedshop/core-worker/module/configureWorkerModule.js';
 
 export default async function workQueueCount(
-  root: Root,
+  root: never,
   params: WorkQueueQuery,
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/worker/workStatistics.ts

@@ -0,0 +1,14 @@
+import { log } from '@unchainedshop/logger';
+import { Context } from '../../../types.js';
+
+export default async function workStatistics(
+  root: never,
+  params: { types?: string[]; from?: Date; to?: Date },
+  { modules, userId }: Context,
+) {
+  log(`query workStatistics ${params.from || ''} ${params.to || ''}`, {
+    userId,
+  });
+
+  return modules.worker.getReport(params);
+}

package/src/resolvers/type/assortment/assortment-filter-types.ts

@@ -1,9 +1,6 @@
-import { Context } from '@unchainedshop/types/api.js';
-import {
-  Assortment,
-  AssortmentFilter as AssortmentFilterType,
-} from '@unchainedshop/types/assortments.js';
-import { Filter } from '@unchainedshop/types/filters.js';
+import { Assortment, AssortmentFilter as AssortmentFilterType } from '@unchainedshop/core-assortments';
+import { Filter } from '@unchainedshop/core-filters';
+import { Context } from '../../../types.js';
 
 type HelperType<T> = (assortmentFilter: AssortmentFilterType, _: never, context: Context) => T;