c15t 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # c15t
 
+## 1.1.4
+
+### Patch Changes
+
+- [#207](https://github.com/c15t/c15t/pull/207) [`2d81c9f`](https://github.com/c15t/c15t/commit/2d81c9fc84ee960e46196dfd460407a925901a82) Thanks [@KayleeWilliams](https://github.com/KayleeWilliams)! - fix(core, react): translations not working
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -28,8 +28,12 @@ __webpack_require__.d(__webpack_exports__, {
     consentTypes: ()=>gdpr_consentTypes,
     C15tClient: ()=>C15tClient,
     defaultTranslationConfig: ()=>defaultTranslationConfig,
+    deepMergeTranslations: ()=>deepMergeTranslations,
+    mergeTranslationConfigs: ()=>mergeTranslationConfigs,
     createTrackingBlocker: ()=>createTrackingBlocker,
     configureConsentManager: ()=>configureConsentManager,
+    detectBrowserLanguage: ()=>detectBrowserLanguage,
+    prepareTranslationConfig: ()=>prepareTranslationConfig,
     OfflineClient: ()=>OfflineClient,
     createConsentManagerStore: ()=>createConsentManagerStore,
     API_ENDPOINTS: ()=>API_ENDPOINTS
@@ -1214,7 +1218,7 @@ const getStoredConsent = ()=>{
     }
 };
 const createConsentManagerStore = (manager, options = {})=>{
-    const { namespace = 'c15tStore', trackingBlockerConfig, isConsentDomain = false } = options;
+    const { namespace = 'c15tStore', trackingBlockerConfig, isConsentDomain = false, translationConfig } = options;
     const storedConsent = getStoredConsent();
     const trackingBlocker = 'undefined' != typeof window ? createTrackingBlocker(trackingBlockerConfig || {}, storedConsent?.consents || initialState.consents) : null;
     const clientCallbacks = manager.getCallbacks();
@@ -1234,6 +1238,9 @@ const createConsentManagerStore = (manager, options = {})=>{
             ...initialState,
             isConsentDomain,
             callbacks: mergedCallbacks,
+            ...translationConfig && {
+                translationConfig
+            },
             ...storedConsent ? {
                 consents: storedConsent.consents,
                 consentInfo: storedConsent.consentInfo,
@@ -1453,6 +1460,52 @@ const createConsentManagerStore = (manager, options = {})=>{
     }
     return store;
 };
+function deepMergeTranslations(base, override) {
+    const sections = [
+        'cookieBanner',
+        'consentManagerDialog',
+        'consentManagerWidget',
+        'consentTypes'
+    ];
+    return sections.reduce((result, section)=>{
+        result[section] = {
+            ...base[section],
+            ...override[section] || {}
+        };
+        return result;
+    }, {});
+}
+function mergeTranslationConfigs(defaultConfig, customConfig) {
+    const mergedTranslations = {
+        ...defaultConfig.translations
+    };
+    if (customConfig?.translations) {
+        if (customConfig.translations.en) mergedTranslations.en = deepMergeTranslations(defaultConfig.translations.en, customConfig.translations.en);
+        for (const [lang, translations] of Object.entries(customConfig.translations))if ('en' !== lang && translations) {
+            const baseTranslations = defaultConfig.translations[lang] || mergedTranslations.en;
+            mergedTranslations[lang] = deepMergeTranslations(baseTranslations, translations);
+        }
+    }
+    return {
+        ...defaultConfig,
+        ...customConfig,
+        translations: mergedTranslations
+    };
+}
+function detectBrowserLanguage(translations, defaultLanguage, disableAutoSwitch = false) {
+    if (disableAutoSwitch) return defaultLanguage || 'en';
+    if ('undefined' == typeof window) return defaultLanguage || 'en';
+    const browserLang = window.navigator.language?.split('-')[0] || '';
+    return browserLang && browserLang in translations ? browserLang : defaultLanguage || 'en';
+}
+function prepareTranslationConfig(defaultConfig, customConfig) {
+    const mergedConfig = mergeTranslationConfigs(defaultConfig, customConfig);
+    const defaultLanguage = detectBrowserLanguage(mergedConfig.translations, mergedConfig.defaultLanguage, mergedConfig.disableAutoLanguageSwitch);
+    return {
+        ...mergedConfig,
+        defaultLanguage
+    };
+}
 exports.API_ENDPOINTS = __webpack_exports__.API_ENDPOINTS;
 exports.C15tClient = __webpack_exports__.C15tClient;
 exports.CustomClient = __webpack_exports__.CustomClient;
@@ -1461,7 +1514,11 @@ exports.configureConsentManager = __webpack_exports__.configureConsentManager;
 exports.consentTypes = __webpack_exports__.consentTypes;
 exports.createConsentManagerStore = __webpack_exports__.createConsentManagerStore;
 exports.createTrackingBlocker = __webpack_exports__.createTrackingBlocker;
+exports.deepMergeTranslations = __webpack_exports__.deepMergeTranslations;
 exports.defaultTranslationConfig = __webpack_exports__.defaultTranslationConfig;
+exports.detectBrowserLanguage = __webpack_exports__.detectBrowserLanguage;
+exports.mergeTranslationConfigs = __webpack_exports__.mergeTranslationConfigs;
+exports.prepareTranslationConfig = __webpack_exports__.prepareTranslationConfig;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "API_ENDPOINTS",
     "C15tClient",
@@ -1471,7 +1528,11 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "consentTypes",
     "createConsentManagerStore",
     "createTrackingBlocker",
-    "defaultTranslationConfig"
+    "deepMergeTranslations",
+    "defaultTranslationConfig",
+    "detectBrowserLanguage",
+    "mergeTranslationConfigs",
+    "prepareTranslationConfig"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/index.d.ts

@@ -136,4 +136,5 @@ export type { PrivacyConsentState } from './store.type';
 export { createTrackingBlocker } from './libs/tracking-blocker';
 export type { TrackingBlockerConfig } from './libs/tracking-blocker';
 export { defaultTranslationConfig } from './translations';
+export { deepMergeTranslations, mergeTranslationConfigs, detectBrowserLanguage, prepareTranslationConfig, } from './utils/translations';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,YAAY,EACX,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,eAAe,GACf,MAAM,oBAAoB,CAAC;AAE5B;;;;;;GAMG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,YAAY,GACZ,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAErE;;;;;;;;;;;GAWG;AACH,YAAY,EACX,gCAAgC,EAChC,gCAAgC,EAChC,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,GACZ,MAAM,sBAAsB,CAAC;AAE9B;;;;;;GAMG;AAEH,cAAc,UAAU,CAAC;AAGzB,YAAY,EACX,YAAY,EACZ,eAAe,GACf,MAAM,gBAAgB,CAAC;AAGxB,cAAc,oBAAoB,CAAC;AAGnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACpD,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACzD,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,YAAY,EACX,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,eAAe,GACf,MAAM,oBAAoB,CAAC;AAE5B;;;;;;GAMG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,YAAY,GACZ,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAErE;;;;;;;;;;;GAWG;AACH,YAAY,EACX,gCAAgC,EAChC,gCAAgC,EAChC,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,GACZ,MAAM,sBAAsB,CAAC;AAE9B;;;;;;GAMG;AAEH,cAAc,UAAU,CAAC;AAGzB,YAAY,EACX,YAAY,EACZ,eAAe,GACf,MAAM,gBAAgB,CAAC;AAGxB,cAAc,oBAAoB,CAAC;AAGnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACpD,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACzD,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EACN,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,wBAAwB,GACxB,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1178,7 +1178,7 @@ const getStoredConsent = ()=>{
     }
 };
 const createConsentManagerStore = (manager, options = {})=>{
-    const { namespace = 'c15tStore', trackingBlockerConfig, isConsentDomain = false } = options;
+    const { namespace = 'c15tStore', trackingBlockerConfig, isConsentDomain = false, translationConfig } = options;
     const storedConsent = getStoredConsent();
     const trackingBlocker = 'undefined' != typeof window ? createTrackingBlocker(trackingBlockerConfig || {}, storedConsent?.consents || initialState.consents) : null;
     const clientCallbacks = manager.getCallbacks();
@@ -1198,6 +1198,9 @@ const createConsentManagerStore = (manager, options = {})=>{
             ...initialState,
             isConsentDomain,
             callbacks: mergedCallbacks,
+            ...translationConfig && {
+                translationConfig
+            },
             ...storedConsent ? {
                 consents: storedConsent.consents,
                 consentInfo: storedConsent.consentInfo,
@@ -1417,4 +1420,50 @@ const createConsentManagerStore = (manager, options = {})=>{
     }
     return store;
 };
-export { API_ENDPOINTS, C15tClient, CustomClient, OfflineClient, configureConsentManager, gdpr_consentTypes as consentTypes, createConsentManagerStore, createTrackingBlocker, defaultTranslationConfig };
+function deepMergeTranslations(base, override) {
+    const sections = [
+        'cookieBanner',
+        'consentManagerDialog',
+        'consentManagerWidget',
+        'consentTypes'
+    ];
+    return sections.reduce((result, section)=>{
+        result[section] = {
+            ...base[section],
+            ...override[section] || {}
+        };
+        return result;
+    }, {});
+}
+function mergeTranslationConfigs(defaultConfig, customConfig) {
+    const mergedTranslations = {
+        ...defaultConfig.translations
+    };
+    if (customConfig?.translations) {
+        if (customConfig.translations.en) mergedTranslations.en = deepMergeTranslations(defaultConfig.translations.en, customConfig.translations.en);
+        for (const [lang, translations] of Object.entries(customConfig.translations))if ('en' !== lang && translations) {
+            const baseTranslations = defaultConfig.translations[lang] || mergedTranslations.en;
+            mergedTranslations[lang] = deepMergeTranslations(baseTranslations, translations);
+        }
+    }
+    return {
+        ...defaultConfig,
+        ...customConfig,
+        translations: mergedTranslations
+    };
+}
+function detectBrowserLanguage(translations, defaultLanguage, disableAutoSwitch = false) {
+    if (disableAutoSwitch) return defaultLanguage || 'en';
+    if ('undefined' == typeof window) return defaultLanguage || 'en';
+    const browserLang = window.navigator.language?.split('-')[0] || '';
+    return browserLang && browserLang in translations ? browserLang : defaultLanguage || 'en';
+}
+function prepareTranslationConfig(defaultConfig, customConfig) {
+    const mergedConfig = mergeTranslationConfigs(defaultConfig, customConfig);
+    const defaultLanguage = detectBrowserLanguage(mergedConfig.translations, mergedConfig.defaultLanguage, mergedConfig.disableAutoLanguageSwitch);
+    return {
+        ...mergedConfig,
+        defaultLanguage
+    };
+}
+export { API_ENDPOINTS, C15tClient, CustomClient, OfflineClient, configureConsentManager, gdpr_consentTypes as consentTypes, createConsentManagerStore, createTrackingBlocker, deepMergeTranslations, defaultTranslationConfig, detectBrowserLanguage, mergeTranslationConfigs, prepareTranslationConfig };

package/dist/store.d.ts

@@ -8,6 +8,7 @@ import type { TrackingBlockerConfig } from './libs/tracking-blocker';
 import type { PrivacyConsentState } from './store.type';
 import type { ComplianceSettings } from './types/compliance';
 import { type AllConsentNames } from './types/gdpr';
+import type { TranslationConfig } from './types/translations';
 /**
  * Configuration options for the consent manager store.
  *
@@ -40,6 +41,10 @@ export interface StoreOptions {
      * @default false
      */
     isConsentDomain?: boolean;
+    /**
+     * Translation configuration for the consent manager.
+     */
+    translationConfig?: TranslationConfig;
 }
 export interface StoreConfig extends Pick<StoreOptions, 'trackingBlockerConfig'> {
 }

package/dist/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAOvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EACX,kBAAkB,EAGlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,cAAc,CAAC;AAqDlE;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC5B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IAErC;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAExE;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC1B;AAGD,MAAM,WAAW,WAChB,SAAQ,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC;CAAG;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,eAAO,MAAM,yBAAyB,GACrC,SAAS,uBAAuB,EAChC,UAAS,YAAiB,4DA4gB1B,CAAC"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAOvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EACX,kBAAkB,EAGlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,cAAc,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAoD9D;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC5B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IAErC;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAExE;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACtC;AAGD,MAAM,WAAW,WAChB,SAAQ,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC;CAAG;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,eAAO,MAAM,yBAAyB,GACrC,SAAS,uBAAuB,EAChC,UAAS,YAAiB,4DA+gB1B,CAAC"}

package/dist/utils/translations.d.ts

@@ -0,0 +1,18 @@
+import type { TranslationConfig, Translations } from '../types/translations';
+/**
+ * Deep merges translation objects
+ */
+export declare function deepMergeTranslations(base: Translations, override: Partial<Translations>): Translations;
+/**
+ * Merges custom translations with defaults
+ */
+export declare function mergeTranslationConfigs(defaultConfig: TranslationConfig, customConfig?: Partial<TranslationConfig>): TranslationConfig;
+/**
+ * Detects browser language and returns appropriate default language
+ */
+export declare function detectBrowserLanguage(translations: Record<string, unknown>, defaultLanguage: string | undefined, disableAutoSwitch?: boolean): string;
+/**
+ * Prepares the translation configuration by merging defaults and detecting language
+ */
+export declare function prepareTranslationConfig(defaultConfig: TranslationConfig, customConfig?: Partial<TranslationConfig>): TranslationConfig;
+//# sourceMappingURL=translations.d.ts.map

package/dist/utils/translations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../src/utils/translations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQ7E;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,YAAY,CAed;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACtC,aAAa,EAAE,iBAAiB,EAChC,YAAY,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACvC,iBAAiB,CAiCnB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,iBAAiB,UAAQ,GACvB,MAAM,CAaR;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACvC,aAAa,EAAE,iBAAiB,EAChC,YAAY,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACvC,iBAAiB,CAQnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c15t",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "license": "GPL-3.0-only",
   "type": "module",
   "exports": {
@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "vitest-localstorage-mock": "^0.1.2",
-    "@c15t/vitest-config": "1.0.0",
-    "@c15t/typescript-config": "0.0.1-beta.1"
+    "@c15t/typescript-config": "0.0.1-beta.1",
+    "@c15t/vitest-config": "1.0.0"
   },
   "publishConfig": {
     "access": "public"