@enonic/nextjs-adapter 3.0.0-RC2 → 3.0.0-RC4

package/src/guillotine/fetchContentPathsForAllLocales.ts

@@ -1,7 +1,7 @@
 import type {ContentPathItem} from '../types';
 
 import {GET_STATIC_PATHS_QUERY} from '../common/constants';
-import {getProjectLocaleConfigs} from '../utils/getProjectLocaleConfigs';
+import {getLocaleMappings} from '../utils/getLocaleMappings';
 import {fetchContentPathsForLocale} from './fetchContentPathsForLocale';
 
 
@@ -10,7 +10,7 @@ export async function fetchContentPathsForAllLocales(
     query: string = GET_STATIC_PATHS_QUERY,
     countPerLocale = 999,
 ): Promise<ContentPathItem[]> {
-    const promises = Object.values(getProjectLocaleConfigs()).map(
+    const promises = Object.values(getLocaleMappings()).map(
         config => fetchContentPathsForLocale(
             path, config, query, countPerLocale,
         ),
@@ -18,4 +18,4 @@ export async function fetchContentPathsForAllLocales(
     return Promise.all(promises).then(results => {
         return results.reduce((all, localePaths) => all.concat(localePaths), []);
     });
-}
+}

package/src/guillotine/fetchContentPathsForLocale.ts

@@ -1,4 +1,4 @@
-import type {ContentApiBaseBody, ContentPathItem, GuillotineResult, ProjectLocaleConfig} from '../types';
+import type {ContentApiBaseBody, ContentPathItem, GuillotineResult, LocaleMapping} from '../types';
 
 
 import {GET_STATIC_PATHS_QUERY} from '../common/constants';
@@ -8,7 +8,7 @@ import {fetchGuillotine} from './fetchGuillotine';
 
 export async function fetchContentPathsForLocale(
     path: string,
-    config: ProjectLocaleConfig,
+    config: LocaleMapping,
     query: string = GET_STATIC_PATHS_QUERY,
     count = 999,
 ): Promise<ContentPathItem[]> {

package/src/guillotine/fetchFromApi.ts

@@ -1,16 +1,16 @@
-import type {FetchOptions, GuillotineResponse, GuillotineResponseJson, ProjectLocaleConfig} from '../types';
+import type {FetchOptions, GuillotineResponse, GuillotineResponseJson, LocaleMapping} from '../types';
 
 /** Generic fetch */
 export async function fetchFromApi<Data = Record<string, unknown>>(
     apiUrl: string,
-    projectConfig: ProjectLocaleConfig,
+    mapping: LocaleMapping,
     options?: FetchOptions,
 ): Promise<GuillotineResponseJson> {
 
     const opts = {
         method: options?.method || 'POST',
         body: options?.body ? JSON.stringify(options?.body) : null,
-        headers: mergeHeaders(projectConfig, options?.headers),
+        headers: mergeHeaders(mapping, options?.headers),
         next: options?.next,
         cache: options?.cache,
     };
@@ -60,7 +60,7 @@ export async function fetchFromApi<Data = Record<string, unknown>>(
     return json;
 }
 
-function mergeHeaders(projectConfig: ProjectLocaleConfig, headers?: HeadersInit): Headers {
+function mergeHeaders(mapping: LocaleMapping, headers?: HeadersInit): Headers {
     const newHeaders = new Headers({
         'Accept': 'application/json',
         'Content-Type': 'application/json',
@@ -71,6 +71,6 @@ function mergeHeaders(projectConfig: ProjectLocaleConfig, headers?: HeadersInit)
         }
         // append last to make sure it is not overwritten
     }
-    newHeaders.set('X-Guillotine-SiteKey', projectConfig.site);
+    newHeaders.set('X-Guillotine-SiteKey', mapping.site);
     return newHeaders;
 }

package/src/guillotine/fetchGuillotine.ts

@@ -1,4 +1,4 @@
-import type {FetchOptions, GuillotineResult, ProjectLocaleConfig} from '../types';
+import type {FetchOptions, GuillotineResult, LocaleMapping} from '../types';
 
 
 import {fetchFromApi} from './fetchFromApi';
@@ -7,7 +7,7 @@ import {fetchFromApi} from './fetchFromApi';
 /** Guillotine-specialized fetch, using the generic fetch above */
 export async function fetchGuillotine<Data = Record<string, unknown>>(
     contentApiUrl: string,
-    projectConfig: ProjectLocaleConfig,
+    mapping: LocaleMapping,
     options?: FetchOptions,
 ): Promise<GuillotineResult> {
     const body = options?.body;
@@ -24,7 +24,7 @@ export async function fetchGuillotine<Data = Record<string, unknown>>(
     const pathMessage = path ? JSON.stringify(path) : '';
     return await fetchFromApi<Data>(
         contentApiUrl,
-        projectConfig,
+        mapping,
         options,
     )
         .then(json => {

package/src/guillotine/fetchMetaData.ts

@@ -1,4 +1,4 @@
-import type {ContentApiBaseBody, MetaResult, ProjectLocaleConfig} from '../types';
+import type {ContentApiBaseBody, MetaResult, LocaleMapping} from '../types';
 
 
 import {getMetaQuery, pageFragmentQuery} from './getMetaData';
@@ -8,7 +8,7 @@ import {fetchGuillotine} from './fetchGuillotine';
 export const fetchMetaData = async (
     contentApiUrl: string,
     xpContentPath: string,
-    projectConfig: ProjectLocaleConfig,
+    mapping: LocaleMapping,
     headers?: {},
 ): Promise<MetaResult> => {
     const body: ContentApiBaseBody = {
@@ -17,7 +17,7 @@ export const fetchMetaData = async (
             path: xpContentPath,
         },
     };
-    const metaResult = await fetchGuillotine<MetaResult>(contentApiUrl, projectConfig, {
+    const metaResult = await fetchGuillotine<MetaResult>(contentApiUrl, mapping, {
         body,
         headers,
     });

package/src/index.ts

@@ -29,9 +29,9 @@ export {validateData} from './guillotine/validateData';
 export {I18n} from './i18n/i18n';
 
 export {getContentApiUrl} from './utils/getContentApiUrl';
-export {getProjectLocaleConfig} from './utils/getProjectLocaleConfig';
-export {getProjectLocaleConfigById} from './utils/getProjectLocaleConfigById';
-export {getProjectLocaleConfigByLocale} from './utils/getProjectLocaleConfigByLocale';
+export {getLocaleMapping} from './utils/getLocaleMapping';
+export {getLocaleMappingByProjectId} from './utils/getLocaleMappingByProjectId';
+export {getLocaleMappingByLocale} from './utils/getLocaleMappingByLocale';
 export {getRequestLocaleInfo} from './utils/getRequestLocaleInfo';
 export {sanitizeGraphqlName} from './utils/sanitizeGraphqlName';
 

package/src/types/index.ts

@@ -33,14 +33,14 @@ export interface PreviewParams {
     params: Record<string, string>
 }
 
-export interface ProjectLocaleConfig {
+export interface LocaleMapping {
     default: boolean
     project: string
     site: string
     locale: string
 }
 
-export type ProjectLocalesConfig = Record<string, ProjectLocaleConfig>;
+export type LocaleMappings = Record<string, LocaleMapping>;
 
 export type SelectorName = 'contentType' | 'page' | 'component' | 'part' | 'layout' | 'macro';
 

package/src/utils/getAllLocales.ts

@@ -0,0 +1,6 @@
+import {getLocaleMappings} from './getLocaleMappings';
+
+
+export function getAllLocales(): string[] {
+    return Object.keys(getLocaleMappings());
+}

package/src/utils/getContentApiUrl.ts

@@ -3,13 +3,13 @@ import type {Context} from '../types';
 
 import {RENDER_MODE} from '../common/constants';
 import {API_URL} from '../common/env';
-import {getProjectLocaleConfig} from './getProjectLocaleConfig';
+import {getLocaleMapping} from './getLocaleMapping';
 import {fixDoubleSlashes} from './fixDoubleSlashes';
 import {getRenderMode} from './getRenderMode';
 
 
 export function getContentApiUrl(context: Context): string {
-    const project = getProjectLocaleConfig(context).project;
+    const project = getLocaleMapping(context).project;
     const branch = getRenderMode(context) === RENDER_MODE.NEXT
         ? 'master'
         : getRenderMode(context) === RENDER_MODE.LIVE
@@ -17,4 +17,4 @@ export function getContentApiUrl(context: Context): string {
             : 'draft';
 
     return fixDoubleSlashes(`${API_URL}/${project}/${branch}`);
-}
+}

package/src/utils/getLocaleMapping.ts

@@ -0,0 +1,24 @@
+import type {Context, LocaleMapping} from '../types';
+
+
+import {PROJECT_ID_HEADER} from '../common/constants';
+import {getLocaleMappingByProjectId} from './getLocaleMappingByProjectId';
+import {getLocaleMappingByLocale} from './getLocaleMappingByLocale';
+
+
+export function getLocaleMapping(context: Context): LocaleMapping {
+    const projectId = context.headers?.get(PROJECT_ID_HEADER);
+
+    let config: LocaleMapping;
+    if (projectId) {
+        // first use project id header
+        config = getLocaleMappingByProjectId(projectId, false);
+    }
+    if (!config) {
+        // next try to use locale from url
+        // it will fall back to default locale if not found
+        config = getLocaleMappingByLocale(context.locale);
+    }
+
+    return config;
+}

package/src/utils/getLocaleMappingByLocale.ts

@@ -0,0 +1,19 @@
+import type {LocaleMapping} from '../types';
+
+
+import {getLocaleMappings} from './getLocaleMappings';
+
+
+export function getLocaleMappingByLocale(locale?: string, useDefault = true): LocaleMapping {
+    const mappings = getLocaleMappings();
+
+    let config: LocaleMapping;
+    if (locale) {
+        config = mappings[locale];
+    }
+    if (!config && useDefault) {
+        config = Object.values(mappings).find(c => c.default);
+    }
+
+    return config;
+}

package/src/utils/getLocaleMappingByProjectId.ts

@@ -0,0 +1,21 @@
+import type {LocaleMapping} from '../types';
+
+
+import {getLocaleMappings} from './getLocaleMappings';
+
+
+export function getLocaleMappingByProjectId(projectId?: string, useDefault = true): LocaleMapping {
+    const mappings = getLocaleMappings();
+
+    let config: LocaleMapping;
+    if (projectId) {
+        config = Object.values(mappings).find(p => {
+            return p?.project?.toLowerCase() === projectId.toLowerCase();
+        });
+    }
+    if (!config && useDefault) {
+        config = Object.values(mappings).find(c => c.default);
+    }
+
+    return config;
+}

package/src/utils/{getProjectLocaleConfigs.ts → getLocaleMappings.ts}

@@ -1,4 +1,4 @@
-import type {ProjectLocalesConfig} from '../types';
+import type {LocaleMappings} from '../types';
 
 
 import {ENV_VARS} from '../common/constants';
@@ -9,7 +9,7 @@ import {MAPPINGS} from '../common/env';
 const PROJECT_CONFIG_REGEXP = /^([\w-]+):([^/\s]+)(\/[\w.-]+)?$/i;
 
 
-export function getProjectLocaleConfigs(): ProjectLocalesConfig {
+export function getLocaleMappings(): LocaleMappings {
     const str = MAPPINGS;
     if (!str?.length) {
         throw new Error(`Did you forget to define "${ENV_VARS.MAPPINGS}" environmental variable?

package/src/utils/getRequestLocaleInfo.ts

@@ -4,18 +4,18 @@ import type {Context} from '../types';
 import Negotiator from 'negotiator';
 import {match as localeMatcher} from '@formatjs/intl-localematcher';
 import {PROJECT_ID_HEADER} from '../common/constants';
-import {getProjectLocaleConfigs} from './getProjectLocaleConfigs';
-import {getProjectLocaleConfigById} from './getProjectLocaleConfigById';
+import {getLocaleMappings} from './getLocaleMappings';
+import {getLocaleMappingByProjectId} from './getLocaleMappingByProjectId';
 
 
 export function getRequestLocaleInfo(context: Context) {
     let locale: string;
-    const configs = getProjectLocaleConfigs();
+    const configs = getLocaleMappings();
     const locales = Object.keys(configs);
     const defaultLocale = locales.find((locale) => configs[locale].default);
     const projectId = context.headers?.get(PROJECT_ID_HEADER);
     if (projectId) {
-        locale = getProjectLocaleConfigById(projectId, false)?.locale;
+        locale = getLocaleMappingByProjectId(projectId, false)?.locale;
 
     } else {
         locale = context.locale;
@@ -26,4 +26,4 @@ export function getRequestLocaleInfo(context: Context) {
         }
     }
     return {locale, locales, defaultLocale};
-}
+}

package/types/index.d.ts

@@ -25,13 +25,13 @@ export interface PreviewParams {
     headers: Record<string, string>;
     params: Record<string, string>;
 }
-export interface ProjectLocaleConfig {
+export interface LocaleMapping {
     default: boolean;
     project: string;
     site: string;
     locale: string;
 }
-export type ProjectLocalesConfig = Record<string, ProjectLocaleConfig>;
+export type LocaleMappings = Record<string, LocaleMapping>;
 export type SelectorName = 'contentType' | 'page' | 'component' | 'part' | 'layout' | 'macro';
 export type FetchOptions = Omit<RequestInit, 'body'> & {
     body?: ContentApiBaseBody;

package/utils/getAllLocales.d.ts

@@ -0,0 +1 @@
+export declare function getAllLocales(): string[];

package/utils/getAllLocales.js

@@ -0,0 +1,5 @@
+import { getLocaleMappings } from './getLocaleMappings';
+export function getAllLocales() {
+    return Object.keys(getLocaleMappings());
+}
+//# sourceMappingURL=getAllLocales.js.map

package/utils/getAllLocales.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAllLocales.js","sourceRoot":"","sources":["../src/utils/getAllLocales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAGtD,MAAM,UAAU,aAAa;IACzB,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC5C,CAAC"}

package/utils/getContentApiUrl.js

@@ -1,10 +1,10 @@
 import { RENDER_MODE } from '../common/constants';
 import { API_URL } from '../common/env';
-import { getProjectLocaleConfig } from './getProjectLocaleConfig';
+import { getLocaleMapping } from './getLocaleMapping';
 import { fixDoubleSlashes } from './fixDoubleSlashes';
 import { getRenderMode } from './getRenderMode';
 export function getContentApiUrl(context) {
-    const project = getProjectLocaleConfig(context).project;
+    const project = getLocaleMapping(context).project;
     const branch = getRenderMode(context) === RENDER_MODE.NEXT
         ? 'master'
         : getRenderMode(context) === RENDER_MODE.LIVE

package/utils/getContentApiUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"getContentApiUrl.js","sourceRoot":"","sources":["../src/utils/getContentApiUrl.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC7C,MAAM,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IACxD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;QACtD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;YACzC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,OAAO,CAAC;IAElB,OAAO,gBAAgB,CAAC,GAAG,OAAO,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"getContentApiUrl.js","sourceRoot":"","sources":["../src/utils/getContentApiUrl.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC7C,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAClD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;QACtD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,IAAI;YACzC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,OAAO,CAAC;IAElB,OAAO,gBAAgB,CAAC,GAAG,OAAO,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;AAC/D,CAAC"}

package/utils/getLocaleMapping.d.ts

@@ -0,0 +1,2 @@
+import type { Context, LocaleMapping } from '../types';
+export declare function getLocaleMapping(context: Context): LocaleMapping;

package/utils/{getProjectLocaleConfig.js → getLocaleMapping.js}

@@ -1,19 +1,19 @@
 import { PROJECT_ID_HEADER } from '../common/constants';
-import { getProjectLocaleConfigById } from './getProjectLocaleConfigById';
-import { getProjectLocaleConfigByLocale } from './getProjectLocaleConfigByLocale';
-export function getProjectLocaleConfig(context) {
+import { getLocaleMappingByProjectId } from './getLocaleMappingByProjectId';
+import { getLocaleMappingByLocale } from './getLocaleMappingByLocale';
+export function getLocaleMapping(context) {
     var _a;
     const projectId = (_a = context.headers) === null || _a === void 0 ? void 0 : _a.get(PROJECT_ID_HEADER);
     let config;
     if (projectId) {
         // first use project id header
-        config = getProjectLocaleConfigById(projectId, false);
+        config = getLocaleMappingByProjectId(projectId, false);
     }
     if (!config) {
         // next try to use locale from url
         // it will fall back to default locale if not found
-        config = getProjectLocaleConfigByLocale(context.locale);
+        config = getLocaleMappingByLocale(context.locale);
     }
     return config;
 }
-//# sourceMappingURL=getProjectLocaleConfig.js.map
+//# sourceMappingURL=getLocaleMapping.js.map

package/utils/getLocaleMapping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLocaleMapping.js","sourceRoot":"","sources":["../src/utils/getLocaleMapping.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAC;AAGpE,MAAM,UAAU,gBAAgB,CAAC,OAAgB;;IAC7C,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,MAAqB,CAAC;IAC1B,IAAI,SAAS,EAAE,CAAC;QACZ,8BAA8B;QAC9B,MAAM,GAAG,2BAA2B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,kCAAkC;QAClC,mDAAmD;QACnD,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/utils/getLocaleMappingByLocale.d.ts

@@ -0,0 +1,2 @@
+import type { LocaleMapping } from '../types';
+export declare function getLocaleMappingByLocale(locale?: string, useDefault?: boolean): LocaleMapping;

package/utils/getLocaleMappingByLocale.js

@@ -0,0 +1,13 @@
+import { getLocaleMappings } from './getLocaleMappings';
+export function getLocaleMappingByLocale(locale, useDefault = true) {
+    const mappings = getLocaleMappings();
+    let config;
+    if (locale) {
+        config = mappings[locale];
+    }
+    if (!config && useDefault) {
+        config = Object.values(mappings).find(c => c.default);
+    }
+    return config;
+}
+//# sourceMappingURL=getLocaleMappingByLocale.js.map

package/utils/getLocaleMappingByLocale.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLocaleMappingByLocale.js","sourceRoot":"","sources":["../src/utils/getLocaleMappingByLocale.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAGtD,MAAM,UAAU,wBAAwB,CAAC,MAAe,EAAE,UAAU,GAAG,IAAI;IACvE,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IAErC,IAAI,MAAqB,CAAC;IAC1B,IAAI,MAAM,EAAE,CAAC;QACT,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QACxB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/utils/getLocaleMappingByProjectId.d.ts

@@ -0,0 +1,2 @@
+import type { LocaleMapping } from '../types';
+export declare function getLocaleMappingByProjectId(projectId?: string, useDefault?: boolean): LocaleMapping;

package/utils/getLocaleMappingByProjectId.js

@@ -0,0 +1,16 @@
+import { getLocaleMappings } from './getLocaleMappings';
+export function getLocaleMappingByProjectId(projectId, useDefault = true) {
+    const mappings = getLocaleMappings();
+    let config;
+    if (projectId) {
+        config = Object.values(mappings).find(p => {
+            var _a;
+            return ((_a = p === null || p === void 0 ? void 0 : p.project) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === projectId.toLowerCase();
+        });
+    }
+    if (!config && useDefault) {
+        config = Object.values(mappings).find(c => c.default);
+    }
+    return config;
+}
+//# sourceMappingURL=getLocaleMappingByProjectId.js.map

package/utils/getLocaleMappingByProjectId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLocaleMappingByProjectId.js","sourceRoot":"","sources":["../src/utils/getLocaleMappingByProjectId.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAGtD,MAAM,UAAU,2BAA2B,CAAC,SAAkB,EAAE,UAAU,GAAG,IAAI;IAC7E,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IAErC,IAAI,MAAqB,CAAC;IAC1B,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;;YACtC,OAAO,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,0CAAE,WAAW,EAAE,MAAK,SAAS,CAAC,WAAW,EAAE,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QACxB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/utils/getLocaleMappings.d.ts

@@ -0,0 +1,2 @@
+import type { LocaleMappings } from '../types';
+export declare function getLocaleMappings(): LocaleMappings;

package/utils/{getProjectLocaleConfigs.js → getLocaleMappings.js}

@@ -2,7 +2,7 @@ import { ENV_VARS } from '../common/constants';
 import { MAPPINGS } from '../common/env';
 // NOTE: Dissallowing slash and any whitespace in 2nd capture group.
 const PROJECT_CONFIG_REGEXP = /^([\w-]+):([^/\s]+)(\/[\w.-]+)?$/i;
-export function getProjectLocaleConfigs() {
+export function getLocaleMappings() {
     const str = MAPPINGS;
     if (!(str === null || str === void 0 ? void 0 : str.length)) {
         throw new Error(`Did you forget to define "${ENV_VARS.MAPPINGS}" environmental variable?
@@ -27,4 +27,4 @@ export function getProjectLocaleConfigs() {
         return config;
     }, {});
 }
-//# sourceMappingURL=getProjectLocaleConfigs.js.map
+//# sourceMappingURL=getLocaleMappings.js.map

package/utils/getLocaleMappings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLocaleMappings.js","sourceRoot":"","sources":["../src/utils/getLocaleMappings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGvC,oEAAoE;AACpE,MAAM,qBAAqB,GAAG,mCAAmC,CAAC;AAGlE,MAAM,UAAU,iBAAiB;IAC7B,MAAM,GAAG,GAAG,QAAQ,CAAC;IACrB,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,CAAC,QAAQ;8HACwD,CAAC,CAAC;IAC5H,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAa,EAAE,EAAE;QAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,OAAO,GAAoB,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3E,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,mIAAmI,CAAC,CAAC;QAC3K,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,GAAG;YACX,OAAO,EAAE,KAAK,KAAK,CAAC;YACpB,OAAO;YACP,IAAI;YACJ,MAAM,EAAE,IAAI;SACf,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC"}

package/utils/getRequestLocaleInfo.js

@@ -1,17 +1,17 @@
 import Negotiator from 'negotiator';
 import { match as localeMatcher } from '@formatjs/intl-localematcher';
 import { PROJECT_ID_HEADER } from '../common/constants';
-import { getProjectLocaleConfigs } from './getProjectLocaleConfigs';
-import { getProjectLocaleConfigById } from './getProjectLocaleConfigById';
+import { getLocaleMappings } from './getLocaleMappings';
+import { getLocaleMappingByProjectId } from './getLocaleMappingByProjectId';
 export function getRequestLocaleInfo(context) {
     var _a, _b, _c;
     let locale;
-    const configs = getProjectLocaleConfigs();
+    const configs = getLocaleMappings();
     const locales = Object.keys(configs);
     const defaultLocale = locales.find((locale) => configs[locale].default);
     const projectId = (_a = context.headers) === null || _a === void 0 ? void 0 : _a.get(PROJECT_ID_HEADER);
     if (projectId) {
-        locale = (_b = getProjectLocaleConfigById(projectId, false)) === null || _b === void 0 ? void 0 : _b.locale;
+        locale = (_b = getLocaleMappingByProjectId(projectId, false)) === null || _b === void 0 ? void 0 : _b.locale;
     }
     else {
         locale = context.locale;

package/utils/getRequestLocaleInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocaleInfo.js","sourceRoot":"","sources":["../src/utils/getRequestLocaleInfo.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,KAAK,IAAI,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AAGxE,MAAM,UAAU,oBAAoB,CAAC,OAAgB;;IACjD,IAAI,MAAc,CAAC;IACnB,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAA,0BAA0B,CAAC,SAAS,EAAE,KAAK,CAAC,0CAAE,MAAM,CAAC;IAElE,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,KAAI,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAC,OAAO,EAAE,EAAC,iBAAiB,EAAE,UAAU,EAAC,EAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACrF,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IACD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"getRequestLocaleInfo.js","sourceRoot":"","sources":["../src/utils/getRequestLocaleInfo.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,KAAK,IAAI,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAG1E,MAAM,UAAU,oBAAoB,CAAC,OAAgB;;IACjD,IAAI,MAAc,CAAC;IACnB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAA,2BAA2B,CAAC,SAAS,EAAE,KAAK,CAAC,0CAAE,MAAM,CAAC;IAEnE,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,KAAI,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAC,OAAO,EAAE,EAAC,iBAAiB,EAAE,UAAU,EAAC,EAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACrF,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IACD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC;AAC5C,CAAC"}

package/src/utils/getProjectLocaleConfig.ts

@@ -1,24 +0,0 @@
-import type {Context, ProjectLocaleConfig} from '../types';
-
-
-import {PROJECT_ID_HEADER} from '../common/constants';
-import {getProjectLocaleConfigById} from './getProjectLocaleConfigById';
-import {getProjectLocaleConfigByLocale} from './getProjectLocaleConfigByLocale';
-
-
-export function getProjectLocaleConfig(context: Context): ProjectLocaleConfig {
-    const projectId = context.headers?.get(PROJECT_ID_HEADER);
-
-    let config: ProjectLocaleConfig;
-    if (projectId) {
-        // first use project id header
-        config = getProjectLocaleConfigById(projectId, false);
-    }
-    if (!config) {
-        // next try to use locale from url
-        // it will fall back to default locale if not found
-        config = getProjectLocaleConfigByLocale(context.locale);
-    }
-
-    return config;
-}

package/src/utils/getProjectLocaleConfigById.ts

@@ -1,21 +0,0 @@
-import type {ProjectLocaleConfig} from '../types';
-
-
-import {getProjectLocaleConfigs} from './getProjectLocaleConfigs';
-
-
-export function getProjectLocaleConfigById(projectId?: string, useDefault = true): ProjectLocaleConfig {
-    const configs = getProjectLocaleConfigs();
-
-    let config: ProjectLocaleConfig;
-    if (projectId) {
-        config = Object.values(configs).find(p => {
-            return p?.project?.toLowerCase() === projectId.toLowerCase();
-        });
-    }
-    if (!config && useDefault) {
-        config = Object.values(configs).find(c => c.default);
-    }
-
-    return config;
-}

package/src/utils/getProjectLocaleConfigByLocale.ts

@@ -1,19 +0,0 @@
-import type {ProjectLocaleConfig} from '../types';
-
-
-import {getProjectLocaleConfigs} from './getProjectLocaleConfigs';
-
-
-export function getProjectLocaleConfigByLocale(locale?: string, useDefault = true): ProjectLocaleConfig {
-    const configs = getProjectLocaleConfigs();
-
-    let config: ProjectLocaleConfig;
-    if (locale) {
-        config = configs[locale];
-    }
-    if (!config && useDefault) {
-        config = Object.values(configs).find(c => c.default);
-    }
-
-    return config;
-}

package/src/utils/getProjectLocales.ts

@@ -1,6 +0,0 @@
-import {getProjectLocaleConfigs} from './getProjectLocaleConfigs';
-
-
-export function getProjectLocales(): string[] {
-    return Object.keys(getProjectLocaleConfigs());
-}

package/utils/getProjectLocaleConfig.d.ts

@@ -1,2 +0,0 @@
-import type { Context, ProjectLocaleConfig } from '../types';
-export declare function getProjectLocaleConfig(context: Context): ProjectLocaleConfig;

package/utils/getProjectLocaleConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getProjectLocaleConfig.js","sourceRoot":"","sources":["../src/utils/getProjectLocaleConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAC,8BAA8B,EAAC,MAAM,kCAAkC,CAAC;AAGhF,MAAM,UAAU,sBAAsB,CAAC,OAAgB;;IACnD,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,MAA2B,CAAC;IAChC,IAAI,SAAS,EAAE,CAAC;QACZ,8BAA8B;QAC9B,MAAM,GAAG,0BAA0B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,kCAAkC;QAClC,mDAAmD;QACnD,MAAM,GAAG,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/utils/getProjectLocaleConfigById.d.ts

@@ -1,2 +0,0 @@
-import type { ProjectLocaleConfig } from '../types';
-export declare function getProjectLocaleConfigById(projectId?: string, useDefault?: boolean): ProjectLocaleConfig;

package/utils/getProjectLocaleConfigById.js

@@ -1,16 +0,0 @@
-import { getProjectLocaleConfigs } from './getProjectLocaleConfigs';
-export function getProjectLocaleConfigById(projectId, useDefault = true) {
-    const configs = getProjectLocaleConfigs();
-    let config;
-    if (projectId) {
-        config = Object.values(configs).find(p => {
-            var _a;
-            return ((_a = p === null || p === void 0 ? void 0 : p.project) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === projectId.toLowerCase();
-        });
-    }
-    if (!config && useDefault) {
-        config = Object.values(configs).find(c => c.default);
-    }
-    return config;
-}
-//# sourceMappingURL=getProjectLocaleConfigById.js.map

package/utils/getProjectLocaleConfigById.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getProjectLocaleConfigById.js","sourceRoot":"","sources":["../src/utils/getProjectLocaleConfigById.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAGlE,MAAM,UAAU,0BAA0B,CAAC,SAAkB,EAAE,UAAU,GAAG,IAAI;IAC5E,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAE1C,IAAI,MAA2B,CAAC;IAChC,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;;YACrC,OAAO,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,0CAAE,WAAW,EAAE,MAAK,SAAS,CAAC,WAAW,EAAE,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QACxB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/utils/getProjectLocaleConfigByLocale.d.ts

@@ -1,2 +0,0 @@
-import type { ProjectLocaleConfig } from '../types';
-export declare function getProjectLocaleConfigByLocale(locale?: string, useDefault?: boolean): ProjectLocaleConfig;

package/utils/getProjectLocaleConfigByLocale.js

@@ -1,13 +0,0 @@
-import { getProjectLocaleConfigs } from './getProjectLocaleConfigs';
-export function getProjectLocaleConfigByLocale(locale, useDefault = true) {
-    const configs = getProjectLocaleConfigs();
-    let config;
-    if (locale) {
-        config = configs[locale];
-    }
-    if (!config && useDefault) {
-        config = Object.values(configs).find(c => c.default);
-    }
-    return config;
-}
-//# sourceMappingURL=getProjectLocaleConfigByLocale.js.map

package/utils/getProjectLocaleConfigByLocale.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getProjectLocaleConfigByLocale.js","sourceRoot":"","sources":["../src/utils/getProjectLocaleConfigByLocale.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAGlE,MAAM,UAAU,8BAA8B,CAAC,MAAe,EAAE,UAAU,GAAG,IAAI;IAC7E,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAE1C,IAAI,MAA2B,CAAC;IAChC,IAAI,MAAM,EAAE,CAAC;QACT,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QACxB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}