@unchainedshop/api 3.1.13 → 4.0.0-rc.3

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

@@ -20,12 +20,12 @@ export const ProductVariationOption: ProductVariationOptionHelperTypes = {
     return obj.productVariationOption;
   },
 
-  texts: async (obj, { forceLocale }, { modules, localeContext }) => {
-    // TODO: use loader
+  texts: async (obj, { forceLocale }, { modules, locale }) => {
+    // TODO: use variation text loader
     return modules.products.variations.texts.findLocalizedVariationText({
-      locale: forceLocale || localeContext.baseName,
       productVariationId: obj._id,
       productVariationOptionValue: obj.productVariationOption,
+      locale: forceLocale ? new Intl.Locale(forceLocale) : locale,
     });
   },
 };

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

@@ -13,10 +13,10 @@ export type HelperType<P, T> = (
 export interface ProductVariationHelperTypes {
   options: HelperType<
     never,
-    Array<{
+    {
       _id: string;
       productVariationOption: string;
-    }>
+    }[]
   >;
   texts: HelperType<{ forceLocale?: string }, Promise<ProductVariationText>>;
 }
@@ -28,11 +28,11 @@ export const ProductVariation: ProductVariationHelperTypes = {
     }));
   },
 
-  texts: async (obj, { forceLocale }, { modules, localeContext }) => {
-    // TODO: use loader
+  texts: async (obj, { forceLocale }, { modules, locale }) => {
+    // TODO: use variation text loader
     return modules.products.variations.texts.findLocalizedVariationText({
       productVariationId: obj._id,
-      locale: forceLocale || localeContext.baseName,
+      locale: forceLocale ? new Intl.Locale(forceLocale) : locale,
     });
   },
 };

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

@@ -1,12 +1,12 @@
 import { Context } from '../../context.js';
 import { SearchConfiguration } from '@unchainedshop/core-filters';
 
-type SearchResultData = {
+export interface SearchResultData {
   searchConfiguration: SearchConfiguration & { productSelector: any };
-  totalProductIds: Array<string>;
-  aggregatedTotalProductIds: Array<string>;
-  aggregatedFilteredProductIds: Array<string>;
-};
+  totalProductIds: string[];
+  aggregatedTotalProductIds: string[];
+  aggregatedFilteredProductIds: string[];
+}
 
 export const ProductSearchResult = {
   productsCount: async (

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

@@ -1,40 +1,26 @@
 import { Quotation as QuotationType } from '@unchainedshop/core-quotations';
 import { Context } from '../../context.js';
-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;
+export const Quotation = {
+  country: async (obj: QuotationType, _: never, { loaders }: Context) =>
+    loaders.countryLoader.load({ isoCode: obj.countryCode }),
 
-type QuotationHelperTypes = {
-  country: HelperType<never, Promise<Country>>;
-  currency: HelperType<never, Promise<Currency>>;
-  isExpired: HelperType<{ referenceDate: Date }, boolean>;
-  status: HelperType<never, string>;
-  product: HelperType<never, Promise<Product>>;
-  user: HelperType<never, Promise<User>>;
-};
-
-export const Quotation: QuotationHelperTypes = {
-  // TODO: use loader
-  country: async (obj, _, { modules }) => modules.countries.findCountry({ isoCode: obj.countryCode }),
-
-  // TODO: use loader
-  currency: async (obj, _, { modules }) => modules.currencies.findCurrency({ isoCode: obj.currency }),
+  currency: async (obj: QuotationType, _: never, { loaders }: Context) =>
+    loaders.currencyLoader.load({ isoCode: obj.currencyCode }),
 
-  isExpired: (obj, { referenceDate }, { modules }) =>
+  isExpired: (obj: QuotationType, { referenceDate }: { referenceDate: Date }, { modules }: Context) =>
     modules.quotations.isExpired(obj, { referenceDate }),
 
-  product: async (obj, _, { loaders }) => {
+  product: async (obj: QuotationType, _: never, { loaders }: Context) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
     });
     return product;
   },
 
-  status: (obj, _, { modules }) => modules.quotations.normalizedStatus(obj),
+  status: (obj: QuotationType, _: never, { modules }: Context) =>
+    modules.quotations.normalizedStatus(obj),
 
-  // TODO: use loader
-  user: (obj, _, { modules }) => modules.users.findUserById(obj.userId),
+  user: async (obj: QuotationType, _: never, { loaders }: Context) =>
+    loaders.userLoader.load({ userId: obj.userId }),
 };

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

@@ -10,7 +10,7 @@ export interface ShopHelperTypes {
   _id: () => string;
   country: HelperType<Country>;
   language: HelperType<Language>;
-  userRoles: HelperType<Array<string>>;
+  userRoles: HelperType<string[]>;
 }
 
 export const Shop: ShopHelperTypes = {
@@ -18,13 +18,11 @@ export const Shop: ShopHelperTypes = {
     return 'root';
   },
 
-  language: async (_root, _params, { localeContext, modules }) => {
-    // TODO: use loader
-    return modules.languages.findLanguage({ isoCode: localeContext.language });
+  language: async (_root, _params, { locale, loaders }) => {
+    return loaders.languageLoader.load({ isoCode: locale.language });
   },
-  country: async (_root, _params, { countryContext, modules }) => {
-    // TODO: use loader
-    return modules.countries.findCountry({ isoCode: countryContext });
+  country: async (_root, _params, { countryCode, loaders }) => {
+    return loaders.countryLoader.load({ isoCode: countryCode });
   },
 
   userRoles: async (_root, _params, context) => {

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

@@ -6,22 +6,19 @@ import { actions } from '../../roles/index.js';
 import { WarehousingDirector } from '@unchainedshop/core';
 
 export const Token = {
-  product: async (token: TokenSurrogate, params: never, { modules }: Context) => {
-    // TODO: use loader
-    return modules.products.findProduct({ productId: token.productId });
+  product: async (token: TokenSurrogate, params: never, { loaders }: Context) => {
+    return loaders.productLoader.load({ productId: token.productId });
   },
 
-  user: async (token: TokenSurrogate, params: never, { modules }: Context) => {
+  user: async (token: TokenSurrogate, params: never, { loaders }: Context) => {
     if (!token.userId) return null;
-    // TODO: use loader
-    return modules.users.findUserById(token.userId);
+    return loaders.userLoader.load({ userId: token.userId });
   },
 
   status: async (token: TokenSurrogate, params: never, { modules }: Context) => {
     if (token.walletAddress && !token.userId) {
       return TokenStatus.DECENTRALIZED;
     }
-    // TODO: use loader?
     const workItems = await modules.worker.findWorkQueue({
       types: ['EXPORT_TOKEN'],
       status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
@@ -35,37 +32,23 @@ export const Token = {
     { forceLocale }: { forceLocale: string },
     context: Context,
   ) => {
-    const { modules } = context;
-    // TODO: use loader
-    const product = await modules.products.findProduct({ productId: token.productId });
+    const { loaders, services } = context;
+    const product = await loaders.productLoader.load({ productId: token.productId });
 
-    // TODO: use loader
-    const virtualProviders = await context.modules.warehousing.findProviders({
-      type: WarehousingProviderType.VIRTUAL,
+    return services.warehousing.ercMetadata({
+      product,
+      token,
+      locale: forceLocale ? new Intl.Locale(forceLocale) : context.locale,
     });
-
-    return WarehousingDirector.tokenMetadata(
-      virtualProviders,
-      {
-        product,
-        token,
-        locale: forceLocale ? new Intl.Locale(forceLocale) : context.localeContext,
-        quantity: token?.quantity || 1,
-        referenceDate: new Date(),
-      },
-      context,
-    );
   },
 
   isInvalidateable: async (token: TokenSurrogate, _params: never, context: Context) => {
-    const { modules } = context;
-    // TODO: use loader
-    const product = await modules.products.findProduct({ productId: token.productId });
+    const { loaders } = context;
+    const product = await loaders.productLoader.load({ productId: token.productId });
 
-    // TODO: use loader
-    const virtualProviders = await context.modules.warehousing.findProviders({
-      type: WarehousingProviderType.VIRTUAL,
-    });
+    const virtualProviders = (await context.modules.warehousing.allProviders()).filter(
+      ({ type }) => type === WarehousingProviderType.VIRTUAL,
+    );
 
     const isInvalidateable = await WarehousingDirector.isInvalidateable(
       virtualProviders,

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

@@ -44,62 +44,62 @@ export interface UserHelperTypes {
   created: HelperType<any, Date>;
   updated: HelperType<any, Date>;
   deleted: HelperType<any, Date>;
-  avatar: HelperType<{ localeContext: Intl.Locale }, File>;
-  bookmarks: HelperType<any, Array<Bookmark>>;
+  avatar: HelperType<{ locale: Intl.Locale }, File>;
+  bookmarks: HelperType<any, Bookmark[]>;
   cart: HelperType<{ orderNumber?: string }, Order>;
-  country: HelperType<{ localeContext: Intl.Locale }, Country>;
-  emails: HelperType<any, Array<string>>;
+  country: HelperType<{ locale: Intl.Locale }, Country>;
+  emails: HelperType<any, string[]>;
   enrollments: HelperType<
     {
-      sort?: Array<SortOption>;
+      sort?: SortOption[];
       queryString?: string;
       limit?: number;
       offset?: number;
-      status?: Array<EnrollmentStatus>;
+      status?: EnrollmentStatus[];
     },
-    Array<Enrollment>
+    Enrollment[]
   >;
   isGuest: HelperType<any, boolean>;
   isInitialPassword: HelperType<any, boolean>;
-  language: HelperType<{ localeContext: Intl.Locale }, Language>;
+  language: HelperType<{ locale: Intl.Locale }, Language>;
   lastBillingAddress: HelperType<any, UserType['lastBillingAddress']>;
   lastContact: HelperType<any, Contact>;
   lastLogin: HelperType<any, UserType['lastLogin']>;
-  allowedActions: HelperType<any, Array<string>>;
+  allowedActions: HelperType<any, string[]>;
   name: HelperType<any, string>;
   orders: HelperType<
     {
       includeCarts: boolean;
-      sort?: Array<SortOption>;
+      sort?: SortOption[];
       queryString?: string;
       status?: OrderStatus[];
       userId?: string;
       limit?: number;
       offset?: number;
     },
-    Array<Order>
+    Order[]
   >;
-  paymentCredentials: HelperType<any, Array<PaymentCredentials>>;
-  tokens: HelperType<any, Array<TokenSurrogate>>;
-  webAuthnCredentials: HelperType<any, Array<WebAuthnCredentials>>;
-  web3Addresses: HelperType<any, Array<Web3Address>>;
+  paymentCredentials: HelperType<any, PaymentCredentials[]>;
+  tokens: HelperType<any, TokenSurrogate[]>;
+  webAuthnCredentials: HelperType<any, WebAuthnCredentials[]>;
+  web3Addresses: HelperType<any, Web3Address[]>;
   primaryEmail: HelperType<any, Email>;
   profile: HelperType<any, UserProfile>;
   quotations: HelperType<
-    { sort?: Array<SortOption>; queryString?: string; userId?: string; limit?: number; offset?: number },
-    Array<Quotation>
+    { sort?: SortOption[]; queryString?: string; userId?: string; limit?: number; offset?: number },
+    Quotation[]
   >;
-  roles: HelperType<any, Array<string>>;
-  tags: HelperType<any, Array<string>>;
+  roles: HelperType<any, string[]>;
+  tags: HelperType<any, string[]>;
   username: HelperType<any, string>;
-  pushSubscriptions: HelperType<any, Array<PushSubscription>>;
+  pushSubscriptions: HelperType<any, PushSubscription[]>;
   reviews: HelperType<
     {
-      sort?: Array<SortOption>;
+      sort?: SortOption[];
       limit?: number;
       offset?: number;
     },
-    Array<ProductReview>
+    ProductReview[]
   >;
   reviewsCount: HelperType<any, number>;
 }
@@ -170,15 +170,14 @@ export const User: UserHelperTypes = {
   bookmarks: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
 
-    // TODO: use loader?
     return context.modules.bookmarks.findBookmarksByUserId(user._id);
   },
 
   async cart(user, params, context) {
-    const { modules, countryContext } = context;
+    const { modules, countryCode } = context;
     await checkAction(context, viewUserOrders, [user, params]);
     return modules.orders.cart({
-      countryCode: countryContext,
+      countryCode,
       orderNumber: params.orderNumber,
       userId: user._id,
     });
@@ -191,7 +190,6 @@ export const User: UserHelperTypes = {
         return service.verified ? [service.address] : [];
       }) || [];
 
-    // TODO: use loader?
     return context.modules.warehousing.findTokensForUser({
       userId: user._id,
       walletAddresses,
@@ -202,16 +200,14 @@ export const User: UserHelperTypes = {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     const userLocale = context.modules.users.userLocale(user);
 
-    // TODO: use loader
-    return context.modules.countries.findCountry({
-      isoCode: userLocale.region?.toUpperCase(),
+    return context.loaders.countryLoader.load({
+      isoCode: userLocale.region,
     });
   },
 
   async enrollments(user, params, context) {
     await checkAction(context, viewUserEnrollments, [user, params]);
 
-    // TODO: use loader?
     return context.modules.enrollments.findEnrollments({
       ...(params || {}),
       userId: user._id,
@@ -221,11 +217,7 @@ export const User: UserHelperTypes = {
   language: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     const userLocale = context.modules.users.userLocale(user);
-
-    // TODO: use loader
-    return context.modules.languages.findLanguage({
-      isoCode: userLocale.language,
-    });
+    return context.loaders.languageLoader.load({ isoCode: userLocale.language });
   },
 
   allowedActions: async (user, params, context) => {
@@ -238,7 +230,6 @@ export const User: UserHelperTypes = {
   orders: async (user, params, context) => {
     await checkAction(context, viewUserOrders, [user, params]);
 
-    // TODO: use loader?
     return context.modules.orders.findOrders({
       ...(params || {}),
       userId: user._id,
@@ -248,7 +239,6 @@ export const User: UserHelperTypes = {
   paymentCredentials: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
 
-    // TODO: use loader?
     return context.modules.payment.paymentCredentials.findPaymentCredentials(
       { ...params.selector, userId: user._id },
       {
@@ -271,7 +261,6 @@ export const User: UserHelperTypes = {
   quotations: async (user, params, context) => {
     await checkAction(context, viewUserQuotations, [user, params]);
 
-    // TODO: use loader?
     return context.modules.quotations.findQuotations({
       ...(params || {}),
       userId: user._id,
@@ -290,7 +279,6 @@ export const User: UserHelperTypes = {
     const { modules } = context;
     await checkAction(context, viewUserProductReviews, [user, params]);
 
-    // TODO: use loader?
     return modules.products.reviews.findProductReviews({
       ...(params || {}),
       authorId: user._id,

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

@@ -28,8 +28,6 @@ export const Work: WorkHelperTypes = {
 
   original: async (obj, _, { modules }) => {
     if (!obj.originalWorkId) return null;
-
-    // TODO: use loader
     return modules.worker.findWork({ workId: obj.originalWorkId });
   },
 

package/src/roles/all.ts

@@ -2,7 +2,6 @@ import { Context } from '../context.js';
 
 export const all = (role, actions) => {
   const isInLoginMutationResponse = (root) => {
-    // eslint-disable-next-line
     if (root && root._inLoginMethodResponse) {
       return true;
     }
@@ -102,6 +101,7 @@ export const all = (role, actions) => {
   role.allow(actions.viewTokens, () => false);
   role.allow(actions.viewStatistics, () => false);
   role.allow(actions.uploadUserAvatar, () => false);
+  role.allow(actions.uploadTempFile, () => false);
   role.allow(actions.impersonate, () => false);
 
   // special case: when doing a login mutation, the user is not logged in technically yet,

package/src/roles/index.ts

@@ -118,6 +118,7 @@ const actions: Record<string, string> = [
   'removeUser',
   'downloadFile',
   'uploadUserAvatar',
+  'uploadTempFile',
 ].reduce((oldValue, actionValue) => {
   const newValue = oldValue;
   newValue[actionValue] = actionValue;

package/src/roles/loggedIn.ts

@@ -248,4 +248,5 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
   role.allow(actions.confirmMediaUpload, () => true);
   role.allow(actions.downloadFile, isFileAccessible);
   role.allow(actions.uploadUserAvatar, canUpdateAvatar);
+  role.allow(actions.uploadTempFile, canUpdateAvatar);
 };

package/src/schema/types/assortment.ts

@@ -2,7 +2,7 @@ export default [
   /* GraphQL */ `
     type AssortmentMediaTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       title: String
       subtitle: String
     }
@@ -12,7 +12,7 @@ export default [
       tags: [LowerCaseString!]
       file: Media
       sortKey: Int!
-      texts(forceLocale: String): AssortmentMediaTexts
+      texts(forceLocale: Locale): AssortmentMediaTexts
     }
 
     """
@@ -29,7 +29,7 @@ export default [
       sequence: Int!
       tags: [LowerCaseString!]
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [AssortmentMedia!]!
-      texts(forceLocale: String): AssortmentTexts
+      texts(forceLocale: Locale): AssortmentTexts
       productAssignments: [AssortmentProduct!]
       filterAssignments: [AssortmentFilter!]
       linkedAssortments: [AssortmentLink!]
@@ -59,7 +59,7 @@ export default [
     """
     type AssortmentPathLink @cacheControl(maxAge: 180) {
       assortmentId: ID!
-      assortmentTexts(forceLocale: String): AssortmentTexts!
+      assortmentTexts(forceLocale: Locale): AssortmentTexts!
       link: AssortmentLink
     }
 
@@ -89,7 +89,7 @@ export default [
 
     type AssortmentTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       slug: String
       title: String
       subtitle: String

package/src/schema/types/country.ts

@@ -10,7 +10,7 @@ export default [
       isBase: Boolean
       defaultCurrency: Currency
       flagEmoji: String
-      name(forceLocale: String): String
+      name(forceLocale: Locale): String
     }
   `,
 ];

package/src/schema/types/delivery.ts

@@ -35,8 +35,12 @@ export default [
       configuration: JSON
       configurationError: DeliveryProviderError
       isActive: Boolean
-      simulatedPrice(currency: String, useNetPrice: Boolean = false, orderId: ID, context: JSON): Price
-        @cacheControl(scope: PRIVATE, maxAge: 10)
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        orderId: ID
+        context: JSON
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
     }
   `,
 ];

package/src/schema/types/filter.ts

@@ -24,14 +24,14 @@ export default [
 
     type FilterTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       title: String
       subtitle: String
     }
 
     type FilterOption @cacheControl(maxAge: 180) {
       _id: ID!
-      texts(forceLocale: String): FilterTexts
+      texts(forceLocale: Locale): FilterTexts
       value: String
     }
 
@@ -40,7 +40,7 @@ export default [
       updated: DateTime
       created: DateTime
       isActive: Boolean
-      texts(forceLocale: String): FilterTexts
+      texts(forceLocale: Locale): FilterTexts
       type: FilterType
       key: String
       options: [FilterOption!]

package/src/schema/types/payment.ts

@@ -50,8 +50,12 @@ export default [
       configuration: JSON
       configurationError: PaymentProviderError
       isActive: Boolean
-      simulatedPrice(currency: String, useNetPrice: Boolean = false, orderId: ID, context: JSON): Price
-        @cacheControl(scope: PRIVATE, maxAge: 10)
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        orderId: ID
+        context: JSON
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
     }
   `,
 ];

package/src/schema/types/price.ts

@@ -4,7 +4,7 @@ export default [
       isTaxable: Boolean!
       isNetPrice: Boolean!
       amount: Int!
-      currency: String!
+      currencyCode: String!
     }
 
     type PriceRange @cacheControl(maxAge: 60) {

package/src/schema/types/product/bundle-product.ts

@@ -12,7 +12,7 @@ export default [
       updated: DateTime
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
-      texts(forceLocale: String): ProductTexts
+      texts(forceLocale: Locale): ProductTexts
       bundleItems: [ProductBundleItem!]
       reviews(
         limit: Int = 10

package/src/schema/types/product/configurable-product.ts

@@ -14,20 +14,20 @@ export default [
 
     type ProductVariationTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       title: String
       subtitle: String
     }
 
     type ProductVariationOption @cacheControl(maxAge: 180) {
       _id: ID!
-      texts(forceLocale: String): ProductVariationTexts
+      texts(forceLocale: Locale): ProductVariationTexts
       value: String
     }
 
     type ProductVariation @cacheControl(maxAge: 180) {
       _id: ID!
-      texts(forceLocale: String): ProductVariationTexts
+      texts(forceLocale: Locale): ProductVariationTexts
       type: ProductVariationType
       key: String
       options: [ProductVariationOption!]
@@ -71,7 +71,7 @@ export default [
       updated: DateTime
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
-      texts(forceLocale: String): ProductTexts
+      texts(forceLocale: Locale): ProductTexts
       assortmentPaths: [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID
@@ -90,13 +90,13 @@ export default [
         quantity: Int = 0
         vectors: [ProductAssignmentVectorInput!]
         includeInactive: Boolean = false
-        currency: String
+        currencyCode: String
       ): PriceRange
       simulatedPriceRange(
         quantity: Int
         vectors: [ProductAssignmentVectorInput!]
         includeInactive: Boolean = false
-        currency: String
+        currencyCode: String
         useNetPrice: Boolean = false
       ): PriceRange @cacheControl(scope: PRIVATE)
 

package/src/schema/types/product/plan-product.ts

@@ -41,16 +41,16 @@ export default [
       updated: DateTime
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
-      texts(forceLocale: String): ProductTexts
-      catalogPrice(quantity: Int = 1, currency: String): Price
-      leveledCatalogPrices(currency: String): [PriceLevel!]!
+      texts(forceLocale: Locale): ProductTexts
+      catalogPrice(quantity: Int = 1, currencyCode: String): Price
+      leveledCatalogPrices(currencyCode: String): [PriceLevel!]!
       simulatedPrice(
-        currency: String
+        currencyCode: String
         useNetPrice: Boolean = false
         quantity: Int = 1
         configuration: [ProductConfigurationParameterInput!]
       ): Price @cacheControl(scope: PRIVATE)
-      assortmentPaths(forceLocale: String): [ProductAssortmentPath!]!
+      assortmentPaths(forceLocale: Locale): [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID
         limit: Int = 10