@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc.11

package/lib/fastify/ercMetadataHandler.js

@@ -0,0 +1,39 @@
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:erc-metadata');
+const errorHandler = (res) => (e) => {
+    logger.error(e.message);
+    res.status(503);
+    return res.send(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+};
+const notFoundHandler = (res) => {
+    logger.error('Method not supported, return 404');
+    res.status(404);
+    return res.send();
+};
+const ercMetadataHandler = async (req, res) => {
+    try {
+        const { services, localeContext } = req.unchainedContext;
+        const url = new URL(req.url, process.env.ROOT_URL);
+        if (!url.pathname.toLowerCase().endsWith('.json'))
+            throw new Error('Invalid ERC Metadata URI');
+        const { productId, localeOrTokenFilename, tokenFileName } = req.params;
+        const locale = tokenFileName ? new Intl.Locale(localeOrTokenFilename) : localeContext;
+        const ercMetadata = await services.warehousing.ercMetadata({
+            productId,
+            locale,
+            chainTokenId: (tokenFileName || localeOrTokenFilename).toLowerCase().replace('.json', ''),
+        });
+        if (!ercMetadata)
+            return notFoundHandler(res);
+        const body = JSON.stringify(ercMetadata);
+        res.status(200);
+        res.header('Content-Length', Buffer.byteLength(body));
+        res.header('Content-Type', 'application/json');
+        return res.send(body);
+    }
+    catch (e) {
+        return errorHandler(res)(e);
+    }
+};
+export default ercMetadataHandler;
+//# sourceMappingURL=ercMetadataHandler.js.map

package/lib/fastify/ercMetadataHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ercMetadataHandler.js","sourceRoot":"","sources":["../../src/fastify/ercMetadataHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,MAAM,MAAM,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AAEtD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;IAClC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;IAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAuB,KAAK,EAClD,GAAmD,EACnD,GAAG,EACH,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC;QACzD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAE/F,MAAM,EAAE,SAAS,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAa,CAAC;QAC9E,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAEtF,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC;YACzD,SAAS;YACT,MAAM;YACN,YAAY,EAAE,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;SAC1F,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW;YAAE,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAC/C,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/lib/fastify/index.d.ts

@@ -1,7 +1,8 @@
 import { YogaServerInstance } from 'graphql-yoga';
 import { mongodb } from '@unchainedshop/mongodb';
 import { UnchainedCore } from '@unchainedshop/core';
-export declare const connect: (fastify: any, { graphqlHandler, db, }: {
+import { FastifyInstance } from 'fastify';
+export declare const connect: (fastify: FastifyInstance, { graphqlHandler, db, }: {
     graphqlHandler: YogaServerInstance<any, any>;
     db: mongodb.Db;
     unchainedAPI: UnchainedCore;

package/lib/fastify/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fastify/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAyEpD,eAAO,MAAM,OAAO,YACT,GAAG,2BAIT;IAAE,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAE,SA2CjG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fastify/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMpD,OAAO,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAuE1D,eAAO,MAAM,OAAO,YACT,eAAe,2BAIrB;IAAE,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAE,SAiEjG,CAAC"}

package/lib/fastify/index.js

@@ -1,6 +1,6 @@
 import { getCurrentContextResolver } from '../context.js';
-// import createBulkImportMiddleware from './createBulkImportMiddleware.js';
-// import createERCMetadataMiddleware from './createERCMetadataMiddleware.js';
+import bulkImportHandler from './bulkImportHandler.js';
+import ercMetadataHandler from './ercMetadataHandler.js';
 import MongoStore from 'connect-mongo';
 import { emit } from '@unchainedshop/events';
 import { API_EVENTS } from '../events.js';
@@ -13,7 +13,7 @@ const resolveUserRemoteAddress = (req) => {
     const remotePort = req.socket?.remotePort;
     return { remoteAddress, remotePort };
 };
-const { GRAPHQL_API_PATH = '/graphql', UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, NODE_ENV, } = process.env;
+const { GRAPHQL_API_PATH = '/graphql', BULK_IMPORT_API_PATH = '/bulk-import', ERC_METADATA_API_PATH = '/erc-metadata/:productId/:localeOrTokenFilename/:tokenFileName?', UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, UNCHAINED_COOKIE_SAMESITE, UNCHAINED_COOKIE_INSECURE, } = process.env;
 const middlewareHook = async function middlewareHook(req, reply) {
     const setHeader = (key, value) => reply.header(key, value);
     const getHeader = (key) => req.headers[key];
@@ -21,30 +21,30 @@ const middlewareHook = async function middlewareHook(req, reply) {
     const context = getCurrentContextResolver();
     async function login(user) {
         req.session.user = user;
-        req.session.userId = user._id;
         const tokenObject = {
             _id: req.session.sessionId,
+            userId: user._id,
             /* eslint-disable-next-line */
             tokenExpires: new Date(req.session?.cookie._expires),
         };
-        await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, { userId: user._id, ...tokenObject });
+        await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, tokenObject);
         /* eslint-disable-next-line */
         user._inLoginMethodResponse = true;
         return { user, ...tokenObject };
     }
     async function logout() {
         /* eslint-disable-line */
-        if (!req.session?.userId)
+        if (!req.session?.user?._id)
             return false;
         const tokenObject = {
             _id: req.session.sessionId,
-            userId: req.session?.userId,
+            userId: req.session?.user?._id,
         };
         req.session.user = null;
-        req.session.userId = null;
         await emit(API_EVENTS.API_LOGOUT, tokenObject);
         return true;
     }
+    const [, accessToken] = req.headers.authorization?.split(' ') || [];
     req.unchainedContext = await context({
         setHeader,
         getHeader,
@@ -52,25 +52,37 @@ const middlewareHook = async function middlewareHook(req, reply) {
         remotePort,
         login,
         logout,
-        user: req.session.user,
-        userId: req.session.userId,
+        accessToken,
+        userId: req.session.user?._id,
     });
 };
 export const connect = (fastify, { graphqlHandler, db, }) => {
+    const cookieName = UNCHAINED_COOKIE_NAME;
+    const domain = UNCHAINED_COOKIE_DOMAIN;
+    const path = UNCHAINED_COOKIE_PATH;
+    const secure = UNCHAINED_COOKIE_INSECURE ? false : true;
+    const sameSite = ({
+        none: 'none',
+        lax: 'lax',
+        strict: 'strict',
+        '1': true,
+        '0': false,
+    }[UNCHAINED_COOKIE_SAMESITE?.trim()?.toLowerCase()] || false);
     fastify.register(fastifyCookie);
     fastify.register(fastifySession, {
         secret: process.env.UNCHAINED_TOKEN_SECRET,
-        cookieName: UNCHAINED_COOKIE_NAME,
+        cookieName,
         store: MongoStore.create({
             client: db.client,
             dbName: db.databaseName,
             collectionName: 'sessions',
         }),
         cookie: {
-            domain: UNCHAINED_COOKIE_DOMAIN,
-            httpOnly: Boolean(NODE_ENV === 'production'),
-            path: UNCHAINED_COOKIE_PATH,
-            secure: NODE_ENV === 'production',
+            domain,
+            httpOnly: true,
+            path,
+            secure,
+            sameSite,
             maxAge: 1000 * 60 * 60 * 24 * 7,
         },
     });
@@ -93,7 +105,15 @@ export const connect = (fastify, { graphqlHandler, db, }) => {
             return reply;
         },
     });
-    //   expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware);
-    //   expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware);
+    fastify.route({
+        url: ERC_METADATA_API_PATH,
+        method: ['GET'],
+        handler: ercMetadataHandler,
+    });
+    fastify.route({
+        url: BULK_IMPORT_API_PATH,
+        method: ['POST'],
+        handler: bulkImportHandler,
+    });
 };
 //# sourceMappingURL=index.js.map

package/lib/fastify/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fastify/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fastify/index.ts"],"names":[],"mappings":"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"}

package/lib/loaders/index.d.ts

@@ -1,5 +1,67 @@
+import DataLoader from 'dataloader';
 import { UnchainedCore } from '@unchainedshop/core';
-import { UnchainedLoaders } from '../types.js';
+import { Product, ProductText, ProductMediaText, ProductMedia } from '@unchainedshop/core-products';
+import { Filter, FilterText } from '@unchainedshop/core-filters';
+import { Assortment, AssortmentLink, AssortmentProduct, AssortmentText, AssortmentMediaType, AssortmentMediaText } from '@unchainedshop/core-assortments';
+import { File } from '@unchainedshop/core-files';
+export interface UnchainedLoaders {
+    loaders: {
+        productLoader: InstanceType<typeof DataLoader<{
+            productId: string;
+        }, Product>>;
+        productLoaderBySKU: InstanceType<typeof DataLoader<{
+            sku: string;
+        }, Product>>;
+        productTextLoader: InstanceType<typeof DataLoader<{
+            productId: string;
+            locale: string;
+        }, ProductText>>;
+        productMediaTextLoader: InstanceType<typeof DataLoader<{
+            productMediaId: string;
+            locale: string;
+        }, ProductMediaText>>;
+        fileLoader: InstanceType<typeof DataLoader<{
+            fileId: string;
+        }, File>>;
+        filterLoader: InstanceType<typeof DataLoader<{
+            filterId: string;
+        }, Filter>>;
+        filterTextLoader: InstanceType<typeof DataLoader<{
+            filterId: string;
+            filterOptionValue?: string;
+            locale: string;
+        }, FilterText>>;
+        assortmentLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+        }, Assortment>>;
+        assortmentTextLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+            locale: string;
+        }, AssortmentText>>;
+        assortmentLinkLoader: InstanceType<typeof DataLoader<{
+            parentAssortmentId: string;
+            childAssortmentId: string;
+        }, AssortmentLink>>;
+        assortmentLinksLoader: InstanceType<typeof DataLoader<{
+            parentAssortmentId?: string;
+            assortmentId?: string;
+        }, AssortmentLink[]>>;
+        assortmentProductLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+            productId: string;
+        }, AssortmentProduct>>;
+        assortmentMediaTextLoader: InstanceType<typeof DataLoader<{
+            assortmentMediaId: string;
+            locale: string;
+        }, AssortmentMediaText>>;
+        productMediasLoader: InstanceType<typeof DataLoader<{
+            productId?: string;
+        }, ProductMedia[]>>;
+        assortmentMediasLoader: InstanceType<typeof DataLoader<{
+            assortmentId?: string;
+        }, AssortmentMediaType[]>>;
+    };
+}
 declare const loaders: (unchainedAPI: UnchainedCore) => Promise<UnchainedLoaders["loaders"]>;
 export default loaders;
 //# sourceMappingURL=index.d.ts.map

package/lib/loaders/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA0B/C,QAAA,MAAM,OAAO,iBAAwB,aAAa,KAAG,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CA8QvF,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}

package/lib/loaders/index.js

@@ -1,26 +1,15 @@
 import DataLoader from 'dataloader';
 import { systemLocale } from '@unchainedshop/utils';
-import { ProductStatus } from '@unchainedshop/core-products';
-function getLocaleStrings(localeObj) {
-    return [localeObj.baseName, localeObj.language, systemLocale.baseName, systemLocale.language];
-}
-function findMatchingText(texts, localeStrings) {
-    return localeStrings.reduce((acc, localeString) => {
-        if (acc)
-            return acc;
-        return texts.find((p) => p.locale.toLowerCase() === localeString.toLowerCase());
-    }, null);
-}
-function getFilteredQueries({ queries, texts, filterFn }) {
-    return queries.map(({ locale, ...queryParams }) => {
-        const localeObj = new Intl.Locale(locale);
-        const filteredTexts = texts.filter(filterFn(queryParams));
-        if (!filteredTexts.length)
-            return null;
-        const localeStrings = getLocaleStrings(localeObj);
-        const filterText = findMatchingText(filteredTexts, localeStrings);
-        return filterText || filteredTexts[0];
-    });
+function getLocaleStrings(locale) {
+    const localeObj = new Intl.Locale(locale);
+    return [
+        ...new Set([
+            localeObj.baseName.toLowerCase(),
+            localeObj.language.toLowerCase(),
+            systemLocale.baseName.toLowerCase(),
+            systemLocale.language.toLowerCase(),
+        ]),
+    ];
 }
 const loaders = async (unchainedAPI) => {
     return {
@@ -31,14 +20,12 @@ const loaders = async (unchainedAPI) => {
                 includeInactive: true,
                 includeLeaves: true,
             });
-            return queries.map(({ assortmentId }) => {
-                return assortments.find((assortment) => {
-                    if (assortment._id !== assortmentId)
-                        return false;
-                    return true;
-                });
-            });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const assortmentMap = {};
+            for (const assortment of assortments) {
+                assortmentMap[assortment._id] = assortment;
+            }
+            return queries.map((q) => assortmentMap[q.assortmentId]);
+        }),
         assortmentTextLoader: new DataLoader(async (queries) => {
             const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
             const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentId: { $in: assortmentIds } }, {
@@ -46,9 +33,17 @@ const loaders = async (unchainedAPI) => {
                     assortmentId: 1,
                 },
             });
-            const filterFn = ({ assortmentId }) => (text) => text.assortmentId === assortmentId;
-            return getFilteredQueries({ queries, texts, filterFn });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+            const textsMap = {};
+            const localeMap = Object.fromEntries(queryLocales.flatMap((queryLocale) => {
+                return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+            }));
+            for (const text of texts) {
+                const locale = localeMap[text.locale.toLowerCase()];
+                textsMap[`${locale}:${text.assortmentId}`] = text;
+            }
+            return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.assortmentId}`]);
+        }),
         assortmentMediaTextLoader: new DataLoader(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 } }, {
@@ -56,26 +51,49 @@ const loaders = async (unchainedAPI) => {
                     assortmentMediaId: 1,
                 },
             });
-            const filterFn = ({ assortmentMediaId }) => (text) => text.assortmentMediaId === assortmentMediaId;
-            return getFilteredQueries({ queries, texts, filterFn });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+            const textsMap = {};
+            const localeMap = Object.fromEntries(queryLocales.flatMap((queryLocale) => {
+                return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+            }));
+            for (const text of texts) {
+                const locale = localeMap[text.locale.toLowerCase()];
+                textsMap[`${locale}:${text.assortmentMediaId}`] = text;
+            }
+            return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.assortmentMediaId}`]);
+        }),
+        assortmentMediasLoader: new DataLoader(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] || []);
+        }),
         assortmentLinkLoader: new DataLoader(async (queries) => {
-            const parentAssortmentIds = [
-                ...new Set(queries.map((q) => q.parentAssortmentId).filter(Boolean)),
-            ];
+            const parentAssortmentIds = [...new Set(queries.map((q) => q.parentAssortmentId).filter(Boolean))];
             const links = await unchainedAPI.modules.assortments.links.findLinks({
                 parentAssortmentIds,
             });
-            return queries.map(({ parentAssortmentId, childAssortmentId }) => {
+            // TODO: Optimize
+            return queries.map((q) => {
                 return links.find((link) => {
-                    if (link.parentAssortmentId !== parentAssortmentId)
+                    if (link.parentAssortmentId !== q.parentAssortmentId)
                         return false;
-                    if (childAssortmentId && link.childAssortmentId !== childAssortmentId)
+                    if (q.childAssortmentId && link.childAssortmentId !== q.childAssortmentId)
                         return false;
                     return true;
                 });
             });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+        }),
         assortmentLinksLoader: new DataLoader(async (queries) => {
             const parentAssortmentIds = [
                 ...new Set(queries.flatMap((q) => q.parentAssortmentId).filter(Boolean)),
@@ -89,45 +107,45 @@ const loaders = async (unchainedAPI) => {
                 (await unchainedAPI.modules.assortments.links.findLinks({
                     assortmentIds,
                 }));
-            return queries.map(({ parentAssortmentId, assortmentId }) => {
-                if (parentAssortmentId) {
-                    return linksByParentAssortmentId.filter((link) => link.parentAssortmentId === parentAssortmentId);
+            // TODO: Optimize
+            return queries.map((q) => {
+                if (q.parentAssortmentId) {
+                    return linksByParentAssortmentId.filter((link) => link.parentAssortmentId === q.parentAssortmentId);
                 }
-                if (assortmentId) {
-                    return linksByAssortmentId.filter((link) => link.parentAssortmentId === assortmentId || link.childAssortmentId === assortmentId);
+                if (q.assortmentId) {
+                    return linksByAssortmentId.filter((link) => link.parentAssortmentId === q.assortmentId || link.childAssortmentId === q.assortmentId);
                 }
                 return [];
             });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+        }),
         assortmentProductLoader: new DataLoader(async (queries) => {
             const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
             const assortmentProducts = await unchainedAPI.modules.assortments.products.findProducts({
                 assortmentIds,
             });
-            return queries.map(({ assortmentId, productId }) => {
+            // TODO: Optimize
+            return queries.map((q) => {
                 return assortmentProducts.find((assortmentProduct) => {
-                    if (assortmentProduct.assortmentId !== assortmentId)
+                    if (assortmentProduct.assortmentId !== q.assortmentId)
                         return false;
-                    if (assortmentProduct.productId !== productId)
+                    if (assortmentProduct.productId !== q.productId)
                         return false;
                     return true;
                 });
             });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+        }),
         filterLoader: new DataLoader(async (queries) => {
             const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
             const filters = await unchainedAPI.modules.filters.findFilters({
                 filterIds,
                 includeInactive: true,
             });
-            return queries.map(({ filterId }) => {
-                return filters.find((product) => {
-                    if (product._id !== filterId)
-                        return false;
-                    return true;
-                });
-            });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const filterMap = {};
+            for (const filter of filters) {
+                filterMap[filter._id] = filter;
+            }
+            return queries.map((q) => filterMap[q.filterId]);
+        }),
         filterTextLoader: new DataLoader(async (queries) => {
             const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
             const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterId: { $in: filterIds } }, {
@@ -135,35 +153,63 @@ const loaders = async (unchainedAPI) => {
                     filterId: 1,
                 },
             });
-            const filterFn = ({ filterId, filterOptionValue }) => (text) => text.filterId === filterId && text.filterOptionValue === filterOptionValue;
-            return getFilteredQueries({ queries, texts, filterFn });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+            const textsMap = {};
+            const localeMap = Object.fromEntries(queryLocales.flatMap((queryLocale) => {
+                return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+            }));
+            for (const text of texts) {
+                const locale = localeMap[text.locale.toLowerCase()];
+                textsMap[`${locale}:${text.filterId}:${text.filterOptionValue}`] = text;
+            }
+            return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.filterId}:${q.filterOptionValue}`]);
+        }),
         productLoader: new DataLoader(async (queries) => {
             const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))]; // you don't need lodash, _.unique my ass
             const products = await unchainedAPI.modules.products.findProducts({
                 productIds,
                 productSelector: {
-                    status: { $in: [null, ProductStatus.ACTIVE, ProductStatus.DELETED] },
+                    status: { $exists: true },
                 },
             });
-            return queries.map(({ productId }) => {
-                return products.find((product) => {
-                    if (product._id !== productId)
-                        return false;
-                    return true;
-                });
+            const productMap = {};
+            for (const product of products) {
+                productMap[product._id] = product;
+            }
+            return queries.map((q) => productMap[q.productId]);
+        }),
+        productLoaderBySKU: new DataLoader(async (queries) => {
+            const skus = [...new Set(queries.map((q) => q.sku).filter(Boolean))]; // you don't need lodash, _.unique my ass
+            const products = await unchainedAPI.modules.products.findProducts({
+                productSelector: {
+                    'warehousing.sku': { $in: skus },
+                    status: { $exists: true },
+                },
             });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const productMap = {};
+            for (const product of products) {
+                productMap[product.warehousing.sku] = product;
+            }
+            return queries.map((q) => productMap[q.sku]);
+        }),
         productTextLoader: new DataLoader(async (queries) => {
-            const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+            const productIds = [...new Set(queries.map((q) => q.productId))].filter(Boolean);
             const texts = await unchainedAPI.modules.products.texts.findTexts({ productId: { $in: productIds } }, {
                 sort: {
                     productId: 1,
                 },
             });
-            const filterFn = ({ productId }) => (text) => text.productId === productId;
-            return getFilteredQueries({ queries, texts, filterFn });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+            const textsMap = {};
+            const localeMap = Object.fromEntries(queryLocales.flatMap((queryLocale) => {
+                return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+            }));
+            for (const text of texts) {
+                const locale = localeMap[text.locale.toLowerCase()];
+                textsMap[`${locale}:${text.productId}`] = text;
+            }
+            return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.productId}`]);
+        }),
         productMediaTextLoader: new DataLoader(async (queries) => {
             const productMediaIds = [...new Set(queries.map((q) => q.productMediaId).filter(Boolean))];
             const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts({ productMediaId: { $in: productMediaIds } }, {
@@ -171,22 +217,44 @@ const loaders = async (unchainedAPI) => {
                     productMediaId: 1,
                 },
             });
-            const filterFn = ({ productMediaId }) => (text) => text.productMediaId === productMediaId;
-            return getFilteredQueries({ queries, texts, filterFn });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+            const textsMap = {};
+            const localeMap = Object.fromEntries(queryLocales.flatMap((queryLocale) => {
+                return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+            }));
+            for (const text of texts) {
+                const locale = localeMap[text.locale.toLowerCase()];
+                textsMap[`${locale}:${text.productMediaId}`] = text;
+            }
+            return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.productMediaId}`]);
+        }),
+        productMediasLoader: new DataLoader(async (queries) => {
+            const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+            const productMediaItems = await unchainedAPI.modules.products.media.findProductMedias({
+                productId: { $in: productIds },
+            });
+            const productMediaMap = {};
+            for (const productMedia of productMediaItems) {
+                if (!productMediaMap[productMedia.productId]) {
+                    productMediaMap[productMedia.productId] = [productMedia];
+                }
+                else {
+                    productMediaMap[productMedia.productId].push(productMedia);
+                }
+            }
+            return queries.map((q) => productMediaMap[q.productId] || []);
+        }),
         fileLoader: new DataLoader(async (queries) => {
             const fileIds = [...new Set(queries.map((q) => q.fileId).filter(Boolean))]; // you don't need lodash, _.unique my ass
             const files = await unchainedAPI.modules.files.findFiles({
                 _id: { $in: fileIds },
             });
-            return queries.map(({ fileId }) => {
-                return files.find((file) => {
-                    if (file._id !== fileId)
-                        return false;
-                    return true;
-                });
-            });
-        }, { batchScheduleFn: (cb) => setImmediate(cb) }),
+            const fileMap = {};
+            for (const file of files) {
+                fileMap[file._id] = file;
+            }
+            return queries.map((q) => fileMap[q.fileId]);
+        }),
     };
 };
 export default loaders;