@unchainedshop/api 3.1.11 → 4.0.0-rc.2

package/lib/schema/types/product/product.js

@@ -25,7 +25,7 @@ export default [
 
     type ProductMediaTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       title: String
       subtitle: String
     }
@@ -35,12 +35,12 @@ export default [
       tags: [LowerCaseString!]
       file: Media
       sortKey: Int!
-      texts(forceLocale: String): ProductMediaTexts
+      texts(forceLocale: Locale): ProductMediaTexts
     }
 
     type ProductTexts @cacheControl(maxAge: 180) {
       _id: ID!
-      locale: Locale
+      locale: Locale!
       slug: String
       title: String
       subtitle: String
@@ -61,7 +61,7 @@ export default [
       created: DateTime
       updated: DateTime
       published: DateTime
-      texts(forceLocale: String): ProductTexts
+      texts(forceLocale: Locale): ProductTexts
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
       reviews(
         limit: Int = 10

package/lib/schema/types/product/simple-product.js

@@ -12,11 +12,11 @@ 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!]

package/lib/schema/types/product/tokenized-product.js

@@ -31,17 +31,17 @@ 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, maxAge: 10)
       simulatedStocks(referenceDate: Timestamp): [Stock!] @cacheControl(scope: PRIVATE, maxAge: 10)
-      assortmentPaths(forceLocale: String): [ProductAssortmentPath!]!
+      assortmentPaths(forceLocale: Locale): [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID
         limit: Int = 10

package/lib/schema/types/warehousing.js

@@ -59,7 +59,7 @@ export default [
       walletAddress: String
       chainId: String
       chainTokenId: String
-      ercMetadata(forceLocale: String): JSON
+      ercMetadata(forceLocale: Locale): JSON
     }
   `,
 ];

package/lib/utils/inputValidation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inputValidation.d.ts","sourceRoot":"","sources":["../../src/utils/inputValidation.ts"],"names":[],"mappings":"AAuBA,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAU5D;AAGD,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,SAAK,GAAG,GAAG,CAmBvD"}

package/lib/utils/inputValidation.js

@@ -0,0 +1,51 @@
+import { GraphQLError } from 'graphql';
+// Dangerous patterns to check for
+const DANGEROUS_PATTERNS = [
+    /<script/i, // Script tags
+    /<iframe/i, // Iframes
+    /<object/i, // Object embeds
+    /<embed/i, // Embed tags
+    /<link/i, // Link tags (can load CSS)
+    /javascript:/i, // JavaScript protocol
+    /vbscript:/i, // VBScript protocol
+    /on\w+\s*=/i, // Event handlers (onclick, onload, etc)
+    /<meta/i, // Meta tags
+    /data:text\/html/i, // Data URLs with HTML
+    /<svg.*onload/i, // SVG with event handlers
+    /&#x?[0-9a-f]+;/i, // HTML entities (could be obfuscation)
+    /\\u[0-9a-f]{4}/i, // Unicode escapes
+    /expression\s*\(/i, // CSS expressions
+    /@import/i, // CSS imports
+    /<!--|-->/, // HTML comments
+];
+// Check for dangerous patterns in any string
+export function checkForDangerousContent(value) {
+    if (!value)
+        return;
+    for (const dangerous of DANGEROUS_PATTERNS) {
+        if (dangerous.test(value)) {
+            throw new GraphQLError('Input contains potentially dangerous content', {
+                extensions: { code: 'SECURITY_VALIDATION_ERROR' },
+            });
+        }
+    }
+}
+// Validate an entire object recursively
+export function validateObject(obj, path = '') {
+    if (typeof obj === 'string') {
+        checkForDangerousContent(obj);
+        return obj;
+    }
+    if (Array.isArray(obj)) {
+        return obj.map((item, index) => validateObject(item, `${path}[${index}]`));
+    }
+    if (obj && typeof obj === 'object') {
+        const validated = {};
+        for (const [key, value] of Object.entries(obj)) {
+            validated[key] = validateObject(value, path ? `${path}.${key}` : key);
+        }
+        return validated;
+    }
+    return obj;
+}
+//# sourceMappingURL=inputValidation.js.map

package/lib/utils/inputValidation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inputValidation.js","sourceRoot":"","sources":["../../src/utils/inputValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,kCAAkC;AAClC,MAAM,kBAAkB,GAAG;IACzB,UAAU,EAAE,cAAc;IAC1B,UAAU,EAAE,UAAU;IACtB,UAAU,EAAE,gBAAgB;IAC5B,SAAS,EAAE,aAAa;IACxB,QAAQ,EAAE,2BAA2B;IACrC,cAAc,EAAE,sBAAsB;IACtC,YAAY,EAAE,oBAAoB;IAClC,YAAY,EAAE,wCAAwC;IACtD,QAAQ,EAAE,YAAY;IACtB,kBAAkB,EAAE,sBAAsB;IAC1C,eAAe,EAAE,0BAA0B;IAC3C,iBAAiB,EAAE,uCAAuC;IAC1D,iBAAiB,EAAE,kBAAkB;IACrC,kBAAkB,EAAE,kBAAkB;IACtC,UAAU,EAAE,cAAc;IAC1B,UAAU,EAAE,gBAAgB;CAC7B,CAAC;AAEF,6CAA6C;AAC7C,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,KAAK,MAAM,SAAS,IAAI,kBAAkB,EAAE,CAAC;QAC3C,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,YAAY,CAAC,8CAA8C,EAAE;gBACrE,UAAU,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,cAAc,CAAC,GAAQ,EAAE,IAAI,GAAG,EAAE;IAChD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "3.1.11",
+  "version": "4.0.0-rc.2",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@ethereumjs/util": ">= 8 < 10",
+    "@ethereumjs/util": ">= 10 < 11",
     "@fastify/cookie": ">= 11.0 < 12",
     "@fastify/session": ">= 11.0 < 12",
     "connect-mongo": ">= 5.1.0 < 6",
@@ -71,11 +71,11 @@
     }
   },
   "dependencies": {
-    "@unchainedshop/core": "^3.1.7",
-    "@unchainedshop/events": "^3.1.7",
-    "@unchainedshop/logger": "^3.1.7",
-    "@unchainedshop/roles": "^3.1.7",
-    "@unchainedshop/utils": "^3.1.7",
+    "@unchainedshop/core": "^4.0.0-rc.2",
+    "@unchainedshop/events": "^4.0.0-rc.2",
+    "@unchainedshop/logger": "^4.0.0-rc.2",
+    "@unchainedshop/roles": "^4.0.0-rc.2",
+    "@unchainedshop/utils": "^4.0.0-rc.2",
     "accounting": "0.4.1",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
@@ -84,16 +84,16 @@
     "p-memoize": "^7.1.1"
   },
   "devDependencies": {
-    "@ethereumjs/util": "^9.1.0",
+    "@ethereumjs/util": "^10.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/session": "^11.1.0",
     "@types/express": "^5.0.1",
-    "@types/node": "^22.13.14",
+    "@types/node": "^22.15.3",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
-    "fastify": "^5.2.2",
+    "fastify": "^5.3.2",
     "passport": "^0.7.0",
-    "tsx": "^4.19.3",
-    "typescript": "^5.8.2"
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3"
   }
 }

package/src/context.ts

@@ -31,12 +31,12 @@ export interface AdminUiConfig {
   singleSignOnURL?: string;
 }
 
-export type UnchainedHTTPServerContext = {
+export interface UnchainedHTTPServerContext {
   setHeader: (key: string, value: string) => void;
   getHeader: (key: string) => string;
   remoteAddress?: string;
   remotePort?: number;
-};
+}
 
 export type Context = UnchainedCore & {
   version?: string;
@@ -83,7 +83,7 @@ export const createContextResolver =
     logout,
   }) => {
     const abstractHttpServerContext = { remoteAddress, remotePort, getHeader, setHeader };
-    const loaders = await instantiateLoaders(unchainedAPI);
+    const loaders = instantiateLoaders(unchainedAPI);
     const localeContext = await getLocaleContext(abstractHttpServerContext, unchainedAPI);
     const userContext: UnchainedUserContext = { login, logout, impersonatorId };
 

package/src/createGraphQLServer.ts

@@ -4,8 +4,8 @@ import { createYoga, createSchema, YogaServerOptions } from 'graphql-yoga';
 const logger = createLogger('unchained:api');
 
 export type GraphQLServerOptions = YogaServerOptions<any, any> & {
-  typeDefs?: Array<string>;
-  resolvers?: Array<Record<string, any>>;
+  typeDefs?: string[];
+  resolvers?: Record<string, any>[];
 };
 
 export default async (options: GraphQLServerOptions) => {

package/src/errors.ts

@@ -300,6 +300,16 @@ export const ProductLinkedToQuotationError = createError(
   'Product is part of a requested/proposed quotations item, remove it from any requested/proposed quotations item before deleting',
 );
 
+export const ProductVariationVectorAlreadySet = createError(
+  'ProductVariationVectorAlreadySet',
+  'Product variation vector is already set, remove the existing one before setting a new one',
+);
+
+export const ProductVariationVectorInvalid = createError(
+  'ProductVariationVectorInvalid',
+  'Product variation vector is invalid/incomplete',
+);
+
 export const FileNotFoundError = createError('FileNotFoundError', 'File not found');
 
 export const FileUploadExpiredError = createError('FileUploadExpired', 'File upload has expired');

package/src/express/createERCMetadataMiddleware.ts

@@ -23,19 +23,25 @@ const ercMetadataMiddleware: RequestHandler = async (
       return methodWrongHandler(res);
     }
 
-    const { services, localeContext } = req.unchainedContext;
+    const { services, modules, loaders, locale } = req.unchainedContext;
     const url = new URL(req.url, ROOT_URL);
     const parsedPath = path.parse(url.pathname);
 
     if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
 
     const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
-    const locale = tokenFileName ? new Intl.Locale(localeOrTokenFilename) : localeContext;
 
-    const ercMetadata = await services.warehousing.ercMetadata({
-      productId,
-      locale,
+    const product = await loaders.productLoader.load({ productId });
+
+    const [token] = await modules.warehousing.findTokens({
       chainTokenId: parsedPath.name,
+      contractAddress: product?.tokenization?.contractAddress,
+    });
+
+    const ercMetadata = await services.warehousing.ercMetadata({
+      product,
+      token,
+      locale: tokenFileName ? new Intl.Locale(localeOrTokenFilename) : locale,
     });
 
     if (!ercMetadata) {

package/src/express/index.ts

@@ -62,18 +62,17 @@ const addContext = async function middlewareWithContext(
       const tokenObject = {
         _id: (req as any).sessionID,
         userId: user._id,
-        /* eslint-disable-next-line */
+
         tokenExpires: new Date((req as any).session?.cookie._expires),
       };
 
       await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, tokenObject);
 
-      /* eslint-disable-next-line */
       (user as any)._inLoginMethodResponse = true;
       return { user, ...tokenObject };
     };
 
-    const logout: LogoutFn = async (sessionId) => { /* eslint-disable-line */
+    const logout: LogoutFn = async (sessionId) => {
       // TODO: this should only logout an explicitly provided session if sessionID
       // has been provided
       // express-session destroy

package/src/fastify/ercMetadataHandler.ts

@@ -17,18 +17,24 @@ const ercMetadataHandler: RouteHandlerMethod = async (
   res,
 ) => {
   try {
-    const { services, localeContext } = req.unchainedContext;
+    const { services, modules, locale, loaders } = req.unchainedContext;
     const url = new URL(req.url, ROOT_URL);
 
     if (!url.pathname.toLowerCase().endsWith('.json')) throw new Error('Invalid ERC Metadata URI');
 
     const { productId, localeOrTokenFilename, tokenFileName } = req.params as any;
-    const locale = tokenFileName ? new Intl.Locale(localeOrTokenFilename) : localeContext;
 
-    const ercMetadata = await services.warehousing.ercMetadata({
-      productId,
-      locale,
+    const product = await loaders.productLoader.load({ productId });
+
+    const [token] = await modules.warehousing.findTokens({
       chainTokenId: (tokenFileName || localeOrTokenFilename).toLowerCase().replace('.json', ''),
+      contractAddress: product?.tokenization?.contractAddress,
+    });
+
+    const ercMetadata = await services.warehousing.ercMetadata({
+      product,
+      token,
+      locale: tokenFileName ? new Intl.Locale(localeOrTokenFilename) : locale,
     });
 
     if (!ercMetadata) return notFoundHandler(res);

package/src/fastify/index.ts

@@ -51,17 +51,16 @@ const middlewareHook = async function middlewareHook(req: any, reply: any) {
     const tokenObject = {
       _id: req.session.sessionId,
       userId: user._id,
-      // eslint-disable-next-line
+
       tokenExpires: new Date((req as any).session.cookie._expires),
     };
     await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, tokenObject);
-    /* eslint-disable-next-line */
+
     (user as any)._inLoginMethodResponse = true;
     return { user, ...tokenObject };
   };
 
   const logout: LogoutFn = async function logout() {
-    /* eslint-disable-line */
     const tokenObject = {
       _id: (req as any).session.sessionId,
       userId: req.session?.userId,

package/src/loaders/assortmentLinkLoader.ts

@@ -0,0 +1,32 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentLink } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ parentAssortmentId: string; childAssortmentId: string }, AssortmentLink>(
+    async (queries) => {
+      const parentAssortmentIds = [...new Set(queries.map((q) => q.parentAssortmentId).filter(Boolean))];
+
+      const links = await unchainedAPI.modules.assortments.links.findLinks({
+        parentAssortmentIds,
+      });
+
+      const assortmentLinkMap = {};
+      for (const link of links) {
+        if (!assortmentLinkMap[link.parentAssortmentId]) {
+          assortmentLinkMap[link.parentAssortmentId] = [link];
+        } else {
+          assortmentLinkMap[link.parentAssortmentId].push(link);
+        }
+      }
+
+      return queries.map((q) => {
+        if (q.childAssortmentId) {
+          return assortmentLinkMap[q.parentAssortmentId].find(
+            (link) => link.childAssortmentId === q.childAssortmentId,
+          );
+        }
+        return assortmentLinkMap[q.parentAssortmentId][0];
+      });
+    },
+  );

package/src/loaders/assortmentLinksLoader.ts

@@ -0,0 +1,46 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentLink } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<
+    { parentAssortmentId?: string; childAssortmentId?: string; assortmentId?: string },
+    AssortmentLink[]
+  >(async (queries) => {
+    const parentAssortmentIds = queries.flatMap((q) => q.parentAssortmentId).filter(Boolean);
+    const childAssortmentIds = queries.flatMap((q) => q.childAssortmentId).filter(Boolean);
+    const assortmentIds = queries.flatMap((q) => q.assortmentId).filter(Boolean);
+
+    const allLinks = await unchainedAPI.modules.assortments.links.findLinks({
+      assortmentIds: [...new Set([...parentAssortmentIds, ...childAssortmentIds, ...assortmentIds])],
+    });
+
+    const parentAssortmentLinkMap = {};
+    const childAssortmentLinkMap = {};
+
+    for (const link of allLinks) {
+      if (!parentAssortmentLinkMap[link.parentAssortmentId]) {
+        parentAssortmentLinkMap[link.parentAssortmentId] = [link];
+      } else {
+        parentAssortmentLinkMap[link.parentAssortmentId].push(link);
+      }
+
+      if (!childAssortmentLinkMap[link.childAssortmentId]) {
+        childAssortmentLinkMap[link.childAssortmentId] = [link];
+      } else {
+        childAssortmentLinkMap[link.childAssortmentId].push(link);
+      }
+    }
+
+    return queries.map((q) => {
+      if (q.parentAssortmentId) {
+        return parentAssortmentLinkMap[q.parentAssortmentId] || [];
+      } else if (q.childAssortmentId) {
+        return childAssortmentLinkMap[q.childAssortmentId] || [];
+      }
+      return [
+        ...(parentAssortmentLinkMap[q.assortmentId] || []),
+        ...(childAssortmentLinkMap[q.assortmentId] || []),
+      ];
+    });
+  });

package/src/loaders/assortmentLoader.ts

@@ -0,0 +1,20 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { Assortment } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ assortmentId: string }, Assortment>(async (queries) => {
+    const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+
+    const assortments = await unchainedAPI.modules.assortments.findAssortments({
+      assortmentIds,
+      includeInactive: true,
+      includeLeaves: true,
+    });
+
+    const assortmentMap = {};
+    for (const assortment of assortments) {
+      assortmentMap[assortment._id] = assortment;
+    }
+    return queries.map((q) => assortmentMap[q.assortmentId]);
+  });

package/src/loaders/assortmentMediaTextLoader.ts

@@ -0,0 +1,26 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentMediaText } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+import { buildLocaleMap } from './utils.js';
+import buildTextMap from './buildTextMap.js';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ assortmentMediaId: string; locale: Intl.Locale }, AssortmentMediaText>(
+    async (queries) => {
+      const assortmentMediaIds = [...new Set(queries.map((q) => q.assortmentMediaId).filter(Boolean))];
+
+      const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts(
+        { assortmentMediaId: { $in: assortmentMediaIds } },
+        {
+          sort: {
+            assortmentMediaId: 1,
+          },
+        },
+      );
+
+      const localeMap = buildLocaleMap(queries, texts);
+      const textsMap = buildTextMap(localeMap, texts, (text) => text.assortmentMediaId);
+
+      return queries.map((q) => textsMap[q.locale + q.assortmentMediaId]);
+    },
+  );

package/src/loaders/assortmentMediasLoader.ts

@@ -0,0 +1,21 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentMediaType } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ assortmentId?: string }, AssortmentMediaType[]>(async (queries) => {
+    const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+    const assortmentMediaItems = await unchainedAPI.modules.assortments.media.findAssortmentMedias({
+      assortmentId: { $in: assortmentIds },
+    });
+
+    const assortmentMediaMap = {};
+    for (const assortmentMedia of assortmentMediaItems) {
+      if (!assortmentMediaMap[assortmentMedia.assortmentId]) {
+        assortmentMediaMap[assortmentMedia.assortmentId] = [assortmentMedia];
+      } else {
+        assortmentMediaMap[assortmentMedia.assortmentId].push(assortmentMedia);
+      }
+    }
+    return queries.map((q) => assortmentMediaMap[q.assortmentId] || []);
+  });

package/src/loaders/assortmentProductLoader.ts

@@ -0,0 +1,19 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentProduct } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ assortmentId: string; productId: string }, AssortmentProduct>(async (queries) => {
+    const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+
+    const assortmentProducts = await unchainedAPI.modules.assortments.products.findAssortmentProducts({
+      assortmentIds,
+    });
+
+    const assortmentProductMap = {};
+    for (const assortmentProduct of assortmentProducts) {
+      assortmentProductMap[assortmentProduct.assortmentId + assortmentProduct.productId] =
+        assortmentProduct;
+    }
+    return queries.map((q) => assortmentProductMap[q.assortmentId + q.productId]);
+  });

package/src/loaders/assortmentProductsLoader.ts

@@ -0,0 +1,22 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentProduct } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ productId: string }, AssortmentProduct[]>(async (queries) => {
+    const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+
+    const assortmentProducts = await unchainedAPI.modules.assortments.products.findAssortmentProducts({
+      productIds,
+    });
+
+    const assortmentProductsMap = {};
+    for (const assortmentProduct of assortmentProducts) {
+      if (!assortmentProductsMap[assortmentProduct.productId]) {
+        assortmentProductsMap[assortmentProduct.productId] = [assortmentProduct];
+      } else {
+        assortmentProductsMap[assortmentProduct.productId].push(assortmentProduct);
+      }
+    }
+    return queries.map((q) => assortmentProductsMap[q.productId] || []);
+  });

package/src/loaders/assortmentTextLoader.ts

@@ -0,0 +1,24 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { AssortmentText } from '@unchainedshop/core-assortments';
+import DataLoader from 'dataloader';
+import { buildLocaleMap } from './utils.js';
+import buildTextMap from './buildTextMap.js';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ assortmentId: string; locale: Intl.Locale }, AssortmentText>(async (queries) => {
+    const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+
+    const texts = await unchainedAPI.modules.assortments.texts.findTexts(
+      { assortmentId: { $in: assortmentIds } },
+      {
+        sort: {
+          assortmentId: 1,
+        },
+      },
+    );
+
+    const localeMap = buildLocaleMap(queries, texts);
+    const textsMap = buildTextMap(localeMap, texts, (text) => text.assortmentId);
+
+    return queries.map((q) => textsMap[q.locale + q.assortmentId]);
+  });

package/src/loaders/buildTextMap.ts

@@ -1,6 +1,6 @@
 type ArrayElement<T> = T extends (infer U)[] ? U : never;
 
-export default function buildTextMap<T extends Array<{ locale?: string }>>(
+export default function buildTextMap<T extends { locale?: string }[]>(
   localeMap: Record<string, string[]>,
   texts: Readonly<T>,
   buildId: (item: ArrayElement<T>) => string,

package/src/loaders/countryLoader.ts

@@ -0,0 +1,20 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { Country } from '@unchainedshop/core-countries';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ isoCode: string }, Country>(async (queries) => {
+    const isoCodes = [...new Set(queries.map((q) => q.isoCode).filter(Boolean))];
+
+    const countries = await unchainedAPI.modules.countries.findCountries({
+      isoCode: { $in: isoCodes },
+      includeInactive: true,
+    });
+
+    const countryMap = {};
+    for (const country of countries) {
+      countryMap[country.isoCode] = country;
+    }
+
+    return queries.map((q) => countryMap[q.isoCode]);
+  });

package/src/loaders/currencyLoader.ts

@@ -0,0 +1,20 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { Currency } from '@unchainedshop/core-currencies';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ isoCode: string }, Currency>(async (queries) => {
+    const isoCodes = [...new Set(queries.map((q) => q.isoCode).filter(Boolean))];
+
+    const currencies = await unchainedAPI.modules.currencies.findCurrencies({
+      isoCode: { $in: isoCodes },
+      includeInactive: true,
+    });
+
+    const currencyMap = {};
+    for (const currency of currencies) {
+      currencyMap[currency.isoCode] = currency;
+    }
+
+    return queries.map((q) => currencyMap[q.isoCode]);
+  });

package/src/loaders/deliveryProviderLoader.ts

@@ -0,0 +1,19 @@
+import { UnchainedCore } from '@unchainedshop/core';
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
+import DataLoader from 'dataloader';
+
+export default (unchainedAPI: UnchainedCore) =>
+  new DataLoader<{ deliveryProviderId: string }, DeliveryProvider>(async (queries) => {
+    const deliveryProviderIds = [...new Set(queries.map((q) => q.deliveryProviderId).filter(Boolean))];
+
+    const deliveryProviders = await unchainedAPI.modules.delivery.findProviders({
+      _id: { $in: deliveryProviderIds },
+    });
+
+    const deliveryProviderMap = {};
+    for (const deliveryProvider of deliveryProviders) {
+      deliveryProviderMap[deliveryProvider._id] = deliveryProvider;
+    }
+
+    return queries.map((q) => deliveryProviderMap[q.deliveryProviderId]);
+  });