@akinon/next 1.14.0 → 1.15.0

package/utils/app-fetch.ts

@@ -1,69 +1,69 @@
-import Settings from 'settings';
-import { ServerVariables } from './server-variables';
-import logger from '../utils/log';
-import { headers } from 'next/headers';
-
-export enum FetchResponseType {
-  JSON = 'json',
-  TEXT = 'text'
-}
-
-const appFetch = async <T>(
-  url: RequestInfo,
-  init: RequestInit = {},
-  responseType = FetchResponseType.JSON
-) => {
-  let response: T;
-  let status: number;
-  let ip = '';
-
-  try {
-    const nextHeaders = headers();
-    ip = nextHeaders.get('x-forwarded-for') ?? '';
-
-    const commerceUrl = Settings.commerceUrl;
-    const currentLocale = Settings.localization.locales.find(
-      (locale) => locale.value === ServerVariables.locale
-    );
-
-    if (commerceUrl === 'default') {
-      logger.error('Commerce URL is not set. Current value is "default"');
-      return undefined;
-    }
-
-    const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
-
-    init.headers = {
-      ...(init.headers ?? {}),
-      'Accept-Language': currentLocale.apiValue,
-      'x-currency': ServerVariables.currency
-    };
-
-    init.next = {
-      revalidate: 60
-    };
-
-    logger.debug(`FETCH START ${url}`, { requestURL, init, ip });
-    const req = await fetch(requestURL, init);
-    status = req.status;
-    logger.debug(`FETCH END ${url}`, { status: req.status, ip });
-
-    const rawData = await req.text();
-
-    if (responseType === FetchResponseType.JSON) {
-      response = JSON.parse(rawData);
-    } else {
-      response = rawData as unknown as T;
-    }
-
-    logger.trace(`FETCH RESPONSE`, { url, response, ip });
-  } catch (error) {
-    if (!url.toString().includes('/cms/seo/')) {
-      logger.error(`FETCH FAILED`, { url, status, error, ip });
-    }
-  }
-
-  return response;
-};
-
-export default appFetch;
+import Settings from 'settings';
+import { ServerVariables } from './server-variables';
+import logger from '../utils/log';
+import { headers } from 'next/headers';
+
+export enum FetchResponseType {
+  JSON = 'json',
+  TEXT = 'text'
+}
+
+const appFetch = async <T>(
+  url: RequestInfo,
+  init: RequestInit = {},
+  responseType = FetchResponseType.JSON
+) => {
+  let response: T;
+  let status: number;
+  let ip = '';
+
+  try {
+    const nextHeaders = headers();
+    ip = nextHeaders.get('x-forwarded-for') ?? '';
+
+    const commerceUrl = Settings.commerceUrl;
+    const currentLocale = Settings.localization.locales.find(
+      (locale) => locale.value === ServerVariables.locale
+    );
+
+    if (commerceUrl === 'default') {
+      logger.error('Commerce URL is not set. Current value is "default"');
+      return undefined;
+    }
+
+    const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
+
+    init.headers = {
+      ...(init.headers ?? {}),
+      'Accept-Language': currentLocale.apiValue,
+      'x-currency': ServerVariables.currency
+    };
+
+    init.next = {
+      revalidate: 60
+    };
+
+    logger.debug(`FETCH START ${url}`, { requestURL, init, ip });
+    const req = await fetch(requestURL, init);
+    status = req.status;
+    logger.debug(`FETCH END ${url}`, { status: req.status, ip });
+
+    const rawData = await req.text();
+
+    if (responseType === FetchResponseType.JSON) {
+      response = JSON.parse(rawData);
+    } else {
+      response = rawData as unknown as T;
+    }
+
+    logger.trace(`FETCH RESPONSE`, { url, response, ip });
+  } catch (error) {
+    if (!url.toString().includes('/cms/seo/')) {
+      logger.error(`FETCH FAILED`, { url, status, error, ip });
+    }
+  }
+
+  return response;
+};
+
+export default appFetch;

package/utils/deep-merge.js

@@ -1,24 +1,24 @@
-function isObject(item) {
-  return item && typeof item === 'object' && !Array.isArray(item);
-}
-
-function deepMerge(target, ...sources) {
-  if (!sources.length) return target;
-
-  const source = sources.shift();
-
-  if (isObject(target) && isObject(source)) {
-    for (const key in source) {
-      if (isObject(source[key])) {
-        if (!target[key]) Object.assign(target, { [key]: {} });
-        deepMerge(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
-    }
-  }
-
-  return deepMerge(target, ...sources);
-}
-
-module.exports = deepMerge;
+function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+
+function deepMerge(target, ...sources) {
+  if (!sources.length) return target;
+
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        deepMerge(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return deepMerge(target, ...sources);
+}
+
+module.exports = deepMerge;

package/utils/image-loader.ts

@@ -1,31 +1,31 @@
-import { buildCDNUrl } from '.';
-import { CDNOptions } from '../types';
-
-export interface ImageLoaderParams {
-  src: string;
-  width: number;
-  quality: number;
-  crop: CDNOptions['crop'];
-  fill?: boolean;
-  aspectRatio?: number;
-}
-
-export const ImageLoader = ({
-  src,
-  width,
-  quality,
-  crop,
-  fill,
-  aspectRatio
-}: ImageLoaderParams) => {
-  if (src.match(/akinoncdn|akinoncloud|b-cdn\.net/)) {
-    return buildCDNUrl(src, {
-      width,
-      height: fill ? parseInt(String(Number(width) / aspectRatio)) : undefined,
-      quality,
-      crop
-    });
-  }
-
-  return src;
-};
+import { buildCDNUrl } from '.';
+import { CDNOptions } from '../types';
+
+export interface ImageLoaderParams {
+  src: string;
+  width: number;
+  quality: number;
+  crop: CDNOptions['crop'];
+  fill?: boolean;
+  aspectRatio?: number;
+}
+
+export const ImageLoader = ({
+  src,
+  width,
+  quality,
+  crop,
+  fill,
+  aspectRatio
+}: ImageLoaderParams) => {
+  if (src.match(/akinoncdn|akinoncloud|b-cdn\.net/)) {
+    return buildCDNUrl(src, {
+      width,
+      height: fill ? parseInt(String(Number(width) / aspectRatio)) : undefined,
+      quality,
+      crop
+    });
+  }
+
+  return src;
+};

package/utils/index.ts

@@ -1,150 +1,150 @@
-import settings from 'settings';
-import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
-
-export * from './get-currency';
-export * from './menu-generator';
-export * from './generate-commerce-search-params';
-
-export function getCookie(name: string) {
-  if (typeof document === 'undefined') {
-    return null;
-  }
-
-  const value = `; ${document.cookie}`;
-  const parts = value.split(`; ${name}=`);
-
-  if (parts.length === 2) {
-    return parts.pop().split(';').shift();
-  }
-}
-
-export function setCookie(name: string, val: string) {
-  const date = new Date();
-  const value = val;
-
-  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
-
-  document.cookie =
-    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
-}
-
-export function removeCookie(name: string) {
-  const date = 'Thu, 01 Jan 1970 00:00:00 UTC';
-
-  document.cookie = `${name}=; expires=${date}; path=/;`;
-}
-
-/**
- * @deprecated Use setCurrency method in useLocalization hook instead.
- */
-export function setCurrency(currency: string) {
-  if (getCookie('pz-currency') !== currency) {
-    setCookie('pz-reset-basket', 'true');
-  }
-
-  setCookie('pz-currency', currency);
-}
-
-export function getTranslateFn(path: string, translations: any) {
-  const get = (parts_: Array<string>, tObj: any) => {
-    const currentPart = parts_[0];
-
-    if (parts_.length === 1) {
-      return tObj?.[currentPart] ?? path;
-    }
-
-    return get(parts_.slice(1), tObj?.[currentPart]);
-  };
-
-  return get(path.split('.'), translations);
-}
-
-export function buildClientRequestUrl(
-  path: string,
-  options?: ClientRequestOptions
-) {
-  let url = `/api/client${path}`;
-
-  if (options) {
-    if (url.includes('?')) {
-      url += '&';
-    } else {
-      url += '?';
-    }
-
-    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
-  }
-
-  return url;
-}
-
-export function capitalize(str: string) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
-export function asTypedObject<E>() {
-  return function <T>(et: { [K in keyof T]: E }) {
-    return et;
-  };
-}
-
-function splitUrlByFileExtension(path: string) {
-  const lastDotIndex = path.lastIndexOf('.');
-  return [path.slice(0, lastDotIndex), path.slice(lastDotIndex)] as const;
-}
-
-export function buildCDNUrl(url: string, config?: CDNOptions) {
-  const [root, fileExtension] = splitUrlByFileExtension(url);
-
-  let options = '';
-
-  if (config) {
-    const { width, height, quality, crop, upscale } = config;
-
-    if (width && height) {
-      options += `_size${width}x${height}`;
-    } else if (height) {
-      options += `_sizex${height}`;
-    } else if (width) {
-      options += `_size${width}`;
-    }
-
-    if (quality) {
-      options += `_quality${quality}`;
-    }
-
-    if (crop) {
-      options += `_crop${capitalize(crop)}`;
-    }
-
-    if (upscale) {
-      options += `_upscale${upscale.toString()}`;
-    }
-  }
-
-  return `${root}${options}${fileExtension}`;
-}
-
-export const urlLocaleMatcherRegex = new RegExp(
-  `^/(${settings.localization.locales
-    .filter((l) =>
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-        ? l.value !== settings.localization.defaultLocaleValue
-        : l
-    )
-    .map((l) => l.value)
-    .join('|')})`
-);
-
-export const getPosError = () => {
-  const error = JSON.parse(getCookie('pz-pos-error') ?? '{}');
-
-  // delete 'pz-pos-error' cookie when refreshing or closing page
-  window.addEventListener('beforeunload', () => {
-    removeCookie('pz-pos-error');
-  });
-
-  return error;
-};
+import settings from 'settings';
+import { LocaleUrlStrategy } from '../localization';
+import { CDNOptions, ClientRequestOptions } from '../types';
+
+export * from './get-currency';
+export * from './menu-generator';
+export * from './generate-commerce-search-params';
+
+export function getCookie(name: string) {
+  if (typeof document === 'undefined') {
+    return null;
+  }
+
+  const value = `; ${document.cookie}`;
+  const parts = value.split(`; ${name}=`);
+
+  if (parts.length === 2) {
+    return parts.pop().split(';').shift();
+  }
+}
+
+export function setCookie(name: string, val: string) {
+  const date = new Date();
+  const value = val;
+
+  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
+
+  document.cookie =
+    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
+}
+
+export function removeCookie(name: string) {
+  const date = 'Thu, 01 Jan 1970 00:00:00 UTC';
+
+  document.cookie = `${name}=; expires=${date}; path=/;`;
+}
+
+/**
+ * @deprecated Use setCurrency method in useLocalization hook instead.
+ */
+export function setCurrency(currency: string) {
+  if (getCookie('pz-currency') !== currency) {
+    setCookie('pz-reset-basket', 'true');
+  }
+
+  setCookie('pz-currency', currency);
+}
+
+export function getTranslateFn(path: string, translations: any) {
+  const get = (parts_: Array<string>, tObj: any) => {
+    const currentPart = parts_[0];
+
+    if (parts_.length === 1) {
+      return tObj?.[currentPart] ?? path;
+    }
+
+    return get(parts_.slice(1), tObj?.[currentPart]);
+  };
+
+  return get(path.split('.'), translations);
+}
+
+export function buildClientRequestUrl(
+  path: string,
+  options?: ClientRequestOptions
+) {
+  let url = `/api/client${path}`;
+
+  if (options) {
+    if (url.includes('?')) {
+      url += '&';
+    } else {
+      url += '?';
+    }
+
+    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
+  }
+
+  return url;
+}
+
+export function capitalize(str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+export function asTypedObject<E>() {
+  return function <T>(et: { [K in keyof T]: E }) {
+    return et;
+  };
+}
+
+function splitUrlByFileExtension(path: string) {
+  const lastDotIndex = path.lastIndexOf('.');
+  return [path.slice(0, lastDotIndex), path.slice(lastDotIndex)] as const;
+}
+
+export function buildCDNUrl(url: string, config?: CDNOptions) {
+  const [root, fileExtension] = splitUrlByFileExtension(url);
+
+  let options = '';
+
+  if (config) {
+    const { width, height, quality, crop, upscale } = config;
+
+    if (width && height) {
+      options += `_size${width}x${height}`;
+    } else if (height) {
+      options += `_sizex${height}`;
+    } else if (width) {
+      options += `_size${width}`;
+    }
+
+    if (quality) {
+      options += `_quality${quality}`;
+    }
+
+    if (crop) {
+      options += `_crop${capitalize(crop)}`;
+    }
+
+    if (upscale) {
+      options += `_upscale${upscale.toString()}`;
+    }
+  }
+
+  return `${root}${options}${fileExtension}`;
+}
+
+export const urlLocaleMatcherRegex = new RegExp(
+  `^/(${settings.localization.locales
+    .filter((l) =>
+      settings.localization.localeUrlStrategy !==
+      LocaleUrlStrategy.ShowAllLocales
+        ? l.value !== settings.localization.defaultLocaleValue
+        : l
+    )
+    .map((l) => l.value)
+    .join('|')})`
+);
+
+export const getPosError = () => {
+  const error = JSON.parse(getCookie('pz-pos-error') ?? '{}');
+
+  // delete 'pz-pos-error' cookie when refreshing or closing page
+  window.addEventListener('beforeunload', () => {
+    removeCookie('pz-pos-error');
+  });
+
+  return error;
+};

package/utils/localization.ts

@@ -1,29 +1,29 @@
-import settings from 'settings';
-import { LocaleUrlStrategy } from '../localization';
-
-export const getUrlPathWithLocale = (
-  pathname: string,
-  currentLocale?: string
-) => {
-  const { defaultLocaleValue, localeUrlStrategy } = settings.localization;
-
-  if (!currentLocale) {
-    currentLocale = defaultLocaleValue;
-  }
-
-  if (localeUrlStrategy === LocaleUrlStrategy.HideAllLocales) {
-    return pathname;
-  }
-
-  if (localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale) {
-    if (currentLocale === defaultLocaleValue) {
-      return pathname;
-    } else {
-      return `/${currentLocale}${pathname}`;
-    }
-  }
-
-  if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-    return `/${currentLocale}${pathname}`;
-  }
-};
+import settings from 'settings';
+import { LocaleUrlStrategy } from '../localization';
+
+export const getUrlPathWithLocale = (
+  pathname: string,
+  currentLocale?: string
+) => {
+  const { defaultLocaleValue, localeUrlStrategy } = settings.localization;
+
+  if (!currentLocale) {
+    currentLocale = defaultLocaleValue;
+  }
+
+  if (localeUrlStrategy === LocaleUrlStrategy.HideAllLocales) {
+    return pathname;
+  }
+
+  if (localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale) {
+    if (currentLocale === defaultLocaleValue) {
+      return pathname;
+    } else {
+      return `/${currentLocale}${pathname}`;
+    }
+  }
+
+  if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+    return `/${currentLocale}${pathname}`;
+  }
+};