@jetshop/core 5.13.11-0 → 5.14.0-alpha.abd04298

package/ChannelHandler/CategoryPathnameRedirectQuery.gql

@@ -1,9 +1,9 @@
-query CategoryPathnameRedirectQuery($id: Int!) {
-  Category: category(id: $id) {
-    id
-    primaryRoute {
-      id
-      path
-    }
-  }
-}
+query CategoryPathnameRedirectQuery($id: Int!) {
+  Category: category(id: $id) {
+    id
+    primaryRoute {
+      id
+      path
+    }
+  }
+}

package/ChannelHandler/ChannelHandler.d.ts

@@ -1,50 +1,52 @@
-import { SelectedChannel } from '@jetshop/core/components/ChannelContext/ChannelContext';
-import { Channel } from '@jetshop/core/types';
-import { RendererOptions } from '@jetshop/core/boot/server/createRenderer';
-import { BootOptions, Routes } from '@jetshop/core/components/ConfigProvider';
-import type { GetPrimaryRoutePath } from './redirectUtils';
-export declare class ChannelHandler {
-    selectedChannel?: SelectedChannel;
-    recommendedChannel?: SelectedChannel;
-    channels?: Channel[];
-    getPrimaryRoutePath?: GetPrimaryRoutePath;
-    constructor(args?: {
-        selectedChannel?: SelectedChannel;
-        recommendedChannel?: SelectedChannel;
-        channels?: Channel[];
-        getPrimaryRoutePath?: GetPrimaryRoutePath;
-    });
-    setGetPrimaryRoutePath: (getPrimaryRoutePath: GetPrimaryRoutePath) => GetPrimaryRoutePath;
-    getSelectedChannel: () => SelectedChannel;
-    setSelectedChannel: (selectedChannel: SelectedChannel) => void;
-    setRecommendedChannel: (recommendedChannel: SelectedChannel) => void;
-    getRecommendedChannel: () => SelectedChannel;
-    setChannels: (channels: Channel[]) => void;
-    getChannels: () => Channel[];
-    getChannelHeaders: () => {
-        currency: string;
-        channelid: number;
-        culture: string;
-        country: string;
-        name: string;
-    } | {
-        currency?: undefined;
-        channelid?: undefined;
-        culture?: undefined;
-        country?: undefined;
-        name?: undefined;
-    };
-    getChannelBasename: () => string;
-    private getPreservedRedirect;
-    getRedirectUrl: ({ newChannel, preserveRedirect, url, routes }: {
-        newChannel: SelectedChannel;
-        preserveRedirect?: boolean;
-        url: string;
-        routes?: Routes;
-    }) => Promise<string>;
-    updateChannel: ({ config, ...args }: {
-        newChannel: SelectedChannel;
-        config: BootOptions | RendererOptions;
-    }) => void;
-    private getPathWithoutBasename;
-}
+import { SelectedChannel } from '@jetshop/core/components/ChannelContext/ChannelContext';
+import { Channel } from '@jetshop/core/types';
+import { RendererOptions } from '@jetshop/core/boot/server/createRenderer';
+import { BootOptions, Routes } from '@jetshop/core/components/ConfigProvider';
+import type { GetPrimaryRoutePath } from './redirectUtils';
+export declare class ChannelHandler {
+    selectedChannel?: SelectedChannel;
+    recommendedChannel?: SelectedChannel;
+    channels?: Channel[];
+    getPrimaryRoutePath?: GetPrimaryRoutePath;
+    selectedChannelGroup?: Channel[] | undefined;
+    constructor(args?: {
+        selectedChannel?: SelectedChannel;
+        recommendedChannel?: SelectedChannel;
+        channels?: Channel[];
+        getPrimaryRoutePath?: GetPrimaryRoutePath;
+        selectedChannelGroup?: Channel[] | undefined;
+    });
+    setGetPrimaryRoutePath: (getPrimaryRoutePath: GetPrimaryRoutePath) => GetPrimaryRoutePath;
+    getSelectedChannel: () => SelectedChannel;
+    setSelectedChannel: (selectedChannel: SelectedChannel) => void;
+    setRecommendedChannel: (recommendedChannel: SelectedChannel) => void;
+    getRecommendedChannel: () => SelectedChannel;
+    setChannels: (channels: Channel[]) => void;
+    getChannels: () => Channel[];
+    getChannelHeaders: () => {
+        currency: string;
+        channelid: number;
+        culture: string;
+        country: string;
+        name: string;
+    } | {
+        currency?: undefined;
+        channelid?: undefined;
+        culture?: undefined;
+        country?: undefined;
+        name?: undefined;
+    };
+    getChannelBasename: () => string;
+    private getPreservedRedirect;
+    getRedirectUrl: ({ newChannel, preserveRedirect, url, routes }: {
+        newChannel: SelectedChannel;
+        preserveRedirect?: boolean;
+        url: string;
+        routes?: Routes;
+    }) => Promise<string>;
+    updateChannel: ({ config, ...args }: {
+        newChannel: SelectedChannel;
+        config: BootOptions | RendererOptions;
+    }) => void;
+    private getPathWithoutBasename;
+}

package/ChannelHandler/ChannelHandler.js

@@ -1,109 +1,115 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import qs from 'qs';
-import { getChannelBasename, getChannelHeaders, getLanguageFromCulture, isInDev } from './channelUtils';
-export class ChannelHandler {
-    constructor(args = {
-        selectedChannel: undefined,
-        recommendedChannel: undefined,
-        channels: undefined,
-        getPrimaryRoutePath: undefined
-    }) {
-        this.setGetPrimaryRoutePath = (getPrimaryRoutePath) => (this.getPrimaryRoutePath = getPrimaryRoutePath);
-        this.getSelectedChannel = () => this.selectedChannel;
-        this.setSelectedChannel = (selectedChannel) => {
-            this.selectedChannel = selectedChannel;
-        };
-        this.setRecommendedChannel = (recommendedChannel) => {
-            this.recommendedChannel = recommendedChannel;
-        };
-        this.getRecommendedChannel = () => this.recommendedChannel;
-        this.setChannels = (channels) => {
-            this.channels = channels;
-        };
-        this.getChannels = () => this.channels;
-        this.getChannelHeaders = () => getChannelHeaders(this.selectedChannel);
-        this.getChannelBasename = () => getChannelBasename(this.selectedChannel);
-        this.getPreservedRedirect = ({ url, newChannel, routes }) => {
-            const path = this.getPathWithoutBasename(url);
-            const routePathsArray = routes
-                ? Object.keys(routes).map((key) => routes[key].path)
-                : [];
-            if (routePathsArray.find((routePath) => path.startsWith(routePath))) {
-                return Promise.resolve(path);
-            }
-            if (path) {
-                return this.getPrimaryRoutePath(path, newChannel, this.setSelectedChannel);
-            }
-            else {
-                return Promise.resolve('/');
-            }
-        };
-        this.getRedirectUrl = ({ newChannel, preserveRedirect = true, url, routes }) => {
-            // If no country is set, select the default country
-            if (!newChannel.country) {
-                newChannel = Object.assign(Object.assign({}, newChannel), { country: newChannel.countries.find((c) => c.isDefault) });
-            }
-            let baseUrl = newChannel.url;
-            if (!newChannel.language.isDefault) {
-                baseUrl =
-                    baseUrl + '/' + getLanguageFromCulture(newChannel.language.culture);
-            }
-            // Used for changing channel in development
-            if (isInDev(url)) {
-                const urlObject = new URL(url);
-                baseUrl = urlObject.origin + (getChannelBasename(newChannel) || '');
-            }
-            function constructUrl(path) {
-                const newUrl = `${path}${qs.stringify(Object.assign(Object.assign({}, qs.parse(new URL(url).search, {
-                    ignoreQueryPrefix: true
-                })), { culture: newChannel.language.culture, currency: newChannel.currency.id, channelCountry: newChannel.country.code, channel: newChannel.name }), { addQueryPrefix: true })}`;
-                return newUrl;
-            }
-            //Unless they specifically disable redirect we want to preserve the route
-            if (preserveRedirect) {
-                return this.getPreservedRedirect({
-                    url,
-                    newChannel,
-                    routes
-                })
-                    .then((newPath) => constructUrl(`${baseUrl}${newPath}`))
-                    .catch(() => constructUrl(baseUrl));
-            }
-            else {
-                const path = this.getPathWithoutBasename(url);
-                return Promise.resolve(constructUrl(`${baseUrl}${path}`));
-            }
-        };
-        this.updateChannel = (_a) => {
-            var { config } = _a, args = __rest(_a, ["config"]);
-            this.getRedirectUrl(Object.assign(Object.assign({}, args), { url: window.location.href, preserveRedirect: config.preserveRedirect, routes: config.routes }))
-                .then((url) => window.location.assign(url))
-                .catch((url) => window.location.assign(url));
-        };
-        const { selectedChannel, recommendedChannel, channels, getPrimaryRoutePath } = args;
-        this.selectedChannel = selectedChannel;
-        this.recommendedChannel = recommendedChannel;
-        this.channels = channels;
-        this.getPrimaryRoutePath = getPrimaryRoutePath;
-    }
-    getPathWithoutBasename(url) {
-        const urlObject = new URL(url);
-        const basename = this.getChannelBasename();
-        const basenameParts = (basename === null || basename === void 0 ? void 0 : basename.split('/')) || [];
-        basenameParts.shift();
-        let path = urlObject.pathname;
-        basenameParts.forEach((part) => (path = path.replace(new RegExp(`^/${part}`), '')));
-        return path;
-    }
-}
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import qs from 'qs';
+import { getChannelBasename, getChannelHeaders, getLanguageFromCulture, isInDev, getGroupedChannels } from './channelUtils';
+export class ChannelHandler {
+    constructor(args = {
+        selectedChannel: undefined,
+        recommendedChannel: undefined,
+        channels: undefined,
+        getPrimaryRoutePath: undefined,
+        selectedChannelGroup: undefined
+    }) {
+        this.setGetPrimaryRoutePath = (getPrimaryRoutePath) => (this.getPrimaryRoutePath = getPrimaryRoutePath);
+        this.getSelectedChannel = () => this.selectedChannel;
+        this.setSelectedChannel = (selectedChannel) => {
+            this.selectedChannel = selectedChannel;
+        };
+        this.setRecommendedChannel = (recommendedChannel) => {
+            this.recommendedChannel = recommendedChannel;
+        };
+        this.getRecommendedChannel = () => this.recommendedChannel;
+        this.setChannels = (channels) => {
+            this.channels = channels;
+            this.selectedChannelGroup = getGroupedChannels(channels, {
+                // Selected channel here is based on the one returned in getSelectedAndRecommendedChannel
+                groupName: this.selectedChannel.groupName
+            });
+        };
+        this.getChannels = () => this.channels;
+        this.getChannelHeaders = () => getChannelHeaders(this.selectedChannel);
+        this.getChannelBasename = () => getChannelBasename(this.selectedChannel);
+        this.getPreservedRedirect = ({ url, newChannel, routes }) => {
+            const path = this.getPathWithoutBasename(url);
+            const routePathsArray = routes
+                ? Object.keys(routes).map((key) => routes[key].path)
+                : [];
+            if (routePathsArray.find((routePath) => path.startsWith(routePath))) {
+                return Promise.resolve(path);
+            }
+            if (path) {
+                return this.getPrimaryRoutePath(path, newChannel, this.setSelectedChannel);
+            }
+            else {
+                return Promise.resolve('/');
+            }
+        };
+        this.getRedirectUrl = ({ newChannel, preserveRedirect = true, url, routes }) => {
+            // If no country is set, select the default country
+            if (!newChannel.country) {
+                newChannel = Object.assign(Object.assign({}, newChannel), { country: newChannel.countries.find((c) => c.isDefault) });
+            }
+            let baseUrl = newChannel.url;
+            if (!newChannel.language.isDefault) {
+                baseUrl =
+                    baseUrl + '/' + getLanguageFromCulture(newChannel.language.culture);
+            }
+            // Used for changing channel in development
+            if (isInDev(url)) {
+                const urlObject = new URL(url);
+                baseUrl = urlObject.origin + (getChannelBasename(newChannel) || '');
+            }
+            function constructUrl(path) {
+                const newUrl = `${path}${qs.stringify(Object.assign(Object.assign({}, qs.parse(new URL(url).search, {
+                    ignoreQueryPrefix: true
+                })), { culture: newChannel.language.culture, currency: newChannel.currency.id, channelCountry: newChannel.country.code, channel: newChannel.name }), { addQueryPrefix: true })}`;
+                return newUrl;
+            }
+            //Unless they specifically disable redirect we want to preserve the route
+            if (preserveRedirect) {
+                return this.getPreservedRedirect({
+                    url,
+                    newChannel,
+                    routes
+                })
+                    .then((newPath) => constructUrl(`${baseUrl}${newPath}`))
+                    .catch(() => constructUrl(baseUrl));
+            }
+            else {
+                const path = this.getPathWithoutBasename(url);
+                return Promise.resolve(constructUrl(`${baseUrl}${path}`));
+            }
+        };
+        this.updateChannel = (_a) => {
+            var { config } = _a, args = __rest(_a, ["config"]);
+            this.getRedirectUrl(Object.assign(Object.assign({}, args), { url: window.location.href, preserveRedirect: config.preserveRedirect, routes: config.routes }))
+                .then((url) => window.location.assign(url))
+                .catch((url) => window.location.assign(url));
+        };
+        const { selectedChannel, recommendedChannel, channels, getPrimaryRoutePath, selectedChannelGroup } = args;
+        this.selectedChannel = selectedChannel;
+        this.recommendedChannel = recommendedChannel;
+        this.channels = channels;
+        this.getPrimaryRoutePath = getPrimaryRoutePath;
+        this.selectedChannelGroup = selectedChannelGroup;
+    }
+    getPathWithoutBasename(url) {
+        const urlObject = new URL(url);
+        const basename = this.getChannelBasename();
+        const basenameParts = (basename === null || basename === void 0 ? void 0 : basename.split('/')) || [];
+        basenameParts.shift();
+        let path = urlObject.pathname;
+        basenameParts.forEach((part) => (path = path.replace(new RegExp(`^/${part}`), '')));
+        return path;
+    }
+}
 //# sourceMappingURL=ChannelHandler.js.map

package/ChannelHandler/ChannelHandler.js.map

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

package/ChannelHandler/PagePathnameRedirectQuery.gql

@@ -1,9 +1,9 @@
-query PagePathnameRedirectQuery($id: Int!) {
-  Page: page(id: $id) {
-    id
-    primaryRoute {
-      id
-      path
-    }
-  }
-}
+query PagePathnameRedirectQuery($id: Int!) {
+  Page: page(id: $id) {
+    id
+    primaryRoute {
+      id
+      path
+    }
+  }
+}

package/ChannelHandler/PreserveRedirectRouteQuery.gql

@@ -1,19 +1,19 @@
-query preserveRedirectRouteQuery($path: String!) {
-  route(path: $path) {
-    id
-    object {
-      ... on Category {
-        id
-      }
-      ... on Product {
-        id
-      }
-      ... on Page {
-        pageId: id
-      }
-      ... on StartPage {
-        id
-      }
-    }
-  }
-}
+query preserveRedirectRouteQuery($path: String!) {
+  route(path: $path) {
+    id
+    object {
+      ... on Category {
+        id
+      }
+      ... on Product {
+        id
+      }
+      ... on Page {
+        id
+      }
+      ... on StartPage {
+        id
+      }
+    }
+  }
+}

package/ChannelHandler/ProductPathnameRedirectQuery.gql

@@ -1,9 +1,9 @@
-query ProductPathnameRedirectQuery($id: Int!) {
-  Product: product(id: $id) {
-    id
-    primaryRoute {
-      id
-      path
-    }
-  }
-}
+query ProductPathnameRedirectQuery($id: Int!) {
+  Product: product(id: $id) {
+    id
+    primaryRoute {
+      id
+      path
+    }
+  }
+}

package/ChannelHandler/StartPagePathnameRedirectQuery.gql

@@ -1,9 +1,9 @@
-query StartPagePathnameRedirectQuery($id: Int!) {
-  StartPage: startPage(id: $id) {
-    id
-    primaryRoute {
-      id
-      path
-    }
-  }
-}
+query StartPagePathnameRedirectQuery($id: Int!) {
+  StartPage: startPage(id: $id) {
+    id
+    primaryRoute {
+      id
+      path
+    }
+  }
+}

package/ChannelHandler/channelUtils.d.ts

@@ -1,68 +1,72 @@
-import { Cookies } from 'react-cookie';
-import { SelectedChannel } from '@jetshop/core/components/ChannelContext/ChannelContext';
-import { Channel } from '@jetshop/core/types';
-export interface QueryObject {
-    culture?: string;
-    currency?: string;
-    channelCountry?: string;
-    channel?: string;
-    redirectDisabled?: boolean;
-    articlenumber?: string;
-}
-export declare const getURLBasename: (url: URL) => string;
-export declare const getURLLanguageBasename: ({ url, singleDomainMode }: {
-    url: URL;
-    singleDomainMode: boolean;
-}) => string;
-/**
- * Returns the default channel from a list of channels
- * @param channels List of channels to search through
- */
-export declare const getDefaultChannel: (channels: Channel[]) => Channel;
-/**
- * Converts a Channel object to a SelectedChannel with the specified culture and currency
- * @param channel Channel to convert
- * @param culture Desired culture
- * @param currency Desired currency
- * @param country? Optional desired country code
- */
-export declare const createSelectedChannel: (channel: Channel, culture?: string, currency?: string, country?: string, urlBasenameLanguage?: string) => SelectedChannel;
-/**
- * Returns a channel with the specified name
- * @param channelName Name of the channel to be fond
- * @param channels Array of channels to search through
- */
-export declare const findChannel: (channelName: string, channels: Channel[]) => Channel;
-export declare const findChannelById: (id: number, channels: Channel[]) => Channel;
-export declare const findChannelByCountry: (countryCode: string, channels: Channel[]) => Channel;
-export declare const getQueryObject: (url: string) => QueryObject;
-export declare const setChannelCookies: ({ culture, currency, channelCountry, channel, redirectDisabled }: QueryObject, cookies: Cookies) => void;
-export declare function getLanguageFromCulture(culture: string): string;
-export declare function getChannelBasename(selectedChannel: SelectedChannel): string;
-export declare function isInDev(url: string): boolean;
-export declare function getSelectedAndRecommendedChannel({ url, singleDomainMode, channels, cookies, geoipCountry, acceptedLanguages, disableGeoRedirect }: {
-    url: string;
-    singleDomainMode: boolean;
-    channels: Channel[];
-    cookies: Cookies;
-    geoipCountry?: string;
-    acceptedLanguages?: string | string[];
-    disableGeoRedirect?: boolean;
-}): {
-    redirect: boolean;
-    selectedChannel: SelectedChannel;
-    recommendedChannel: SelectedChannel;
-};
-export declare function getChannelHeaders(channel?: SelectedChannel): {
-    currency: string;
-    channelid: number;
-    culture: string;
-    country: string;
-    name: string;
-} | {
-    currency?: undefined;
-    channelid?: undefined;
-    culture?: undefined;
-    country?: undefined;
-    name?: undefined;
-};
+import { Cookies } from 'react-cookie';
+import { SelectedChannel } from '@jetshop/core/components/ChannelContext/ChannelContext';
+import { Channel } from '@jetshop/core/types';
+export interface QueryObject {
+    culture?: string;
+    currency?: string;
+    channelCountry?: string;
+    channel?: string;
+    redirectDisabled?: boolean;
+    articlenumber?: string;
+}
+export declare const getGroupedChannels: (availableChannels: Channel[], { groupName }: {
+    groupName: string;
+}) => Channel[];
+export declare const getURLBasename: (url: URL) => string;
+export declare const getURLLanguageBasename: ({ url, singleDomainMode }: {
+    url: URL;
+    singleDomainMode: boolean;
+}) => string;
+/**
+ * Returns the default channel from a list of channels
+ * @param channels List of channels to search through
+ */
+export declare const getDefaultChannel: (channels: Channel[]) => Channel;
+/**
+ * Converts a Channel object to a SelectedChannel with the specified culture and currency
+ * @param channel Channel to convert
+ * @param culture Desired culture
+ * @param currency Desired currency
+ * @param country? Optional desired country code
+ */
+export declare const createSelectedChannel: (channel: Channel, culture?: string, currency?: string, country?: string, urlBasenameLanguage?: string) => SelectedChannel;
+/**
+ * Returns a channel with the specified name
+ * @param channelName Name of the channel to be fond
+ * @param channels Array of channels to search through
+ */
+export declare const findChannel: (channelName: string, channels: Channel[]) => Channel;
+export declare const findChannelById: (id: number, channels: Channel[]) => Channel;
+export declare const findChannelByCountry: (countryCode: string, channels: Channel[]) => Channel;
+export declare const getQueryObject: (url: string) => QueryObject;
+export declare const setChannelCookies: ({ culture, currency, channelCountry, channel, redirectDisabled }: QueryObject, cookies: Cookies) => void;
+export declare function getLanguageFromCulture(culture: string): string;
+export declare function getChannelBasename(selectedChannel: SelectedChannel): string;
+export declare function isInDev(url: string): boolean;
+export declare function getSelectedAndRecommendedChannel({ url, singleDomainMode, channels, cookies, geoipCountry, acceptedLanguages, disableGeoRedirect }: {
+    url: string;
+    singleDomainMode: boolean;
+    channels: Channel[];
+    cookies: Cookies;
+    geoipCountry?: string;
+    acceptedLanguages?: string | string[];
+    disableGeoRedirect?: boolean;
+}): {
+    redirect: boolean;
+    selectedChannel: SelectedChannel;
+    recommendedChannel: SelectedChannel;
+    channels: Channel[];
+};
+export declare function getChannelHeaders(channel?: SelectedChannel): {
+    currency: string;
+    channelid: number;
+    culture: string;
+    country: string;
+    name: string;
+} | {
+    currency?: undefined;
+    channelid?: undefined;
+    culture?: undefined;
+    country?: undefined;
+    name?: undefined;
+};