@dargmuesli/nuxt-cookie-control 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-cookie-control",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "configKey": "cookieControl",
   "compatibility": {
     "nuxt": "^3.0.0"

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { resolve } from 'node:path';
 import { createResolver, defineNuxtModule, addPlugin, addImports, addTemplate, extendWebpackConfig, resolvePath } from '@nuxt/kit';
 
 const name = "@dargmuesli/nuxt-cookie-control";
-const version = "3.0.0-beta.4";
+const version = "3.0.0-beta.6";
 
 const en = {
   acceptAll: "Accept all",

package/dist/runtime/components/CookieControl.vue

@@ -87,9 +87,8 @@
                           getCookieIds(localCookiesEnabled)?.includes(
                             getCookieId(cookie)
                           ) ||
-                          (Cookies.get(
-                            moduleOptions.cookieNameIsConsentGiven
-                          ) !== 'true' &&
+                          (getCookie(moduleOptions.cookieNameIsConsentGiven) !==
+                            'true' &&
                             typeof moduleOptions.isIframeBlocked === 'object' &&
                             moduleOptions.isIframeBlocked.initialState)
                         "
@@ -162,11 +161,17 @@
 </template>
 
 <script setup lang="ts">
-import Cookies from 'js-cookie'
 import { ref, computed, onBeforeMount, watch } from 'vue'
 
 import { Cookie, CookieType, Locale, Translatable } from '../types'
-import { getCookieId, getCookieIds, useResolveTranslatable } from '../methods'
+import {
+  getCookie,
+  getCookieId,
+  getCookieIds,
+  removeCookie,
+  setCookie,
+  useResolveTranslatable,
+} from '../methods'
 
 import { useCookieControl } from '#imports'
 
@@ -214,9 +219,14 @@ const acceptNecessary = () => {
   })
 }
 const acceptPartial = () => {
+  const localCookiesEnabledIds = getCookieIds(localCookiesEnabled.value)
+
   setCookies({
     isConsentGiven: true,
-    cookiesOptionalEnabled: localCookiesEnabled.value,
+    cookiesOptionalEnabled: [
+      ...moduleOptions.cookies?.necessary,
+      ...moduleOptions.cookies.optional,
+    ].filter((cookie) => localCookiesEnabledIds.includes(getCookieId(cookie))),
   })
 }
 const declineAll = () => {
@@ -226,13 +236,14 @@ const declineAll = () => {
   })
 }
 const toogleCookie = (cookie: Cookie) => {
-  if (!localCookiesEnabled.value.includes(cookie)) {
+  const cookieIndex = getCookieIds(localCookiesEnabled.value).indexOf(
+    getCookieId(cookie)
+  )
+
+  if (cookieIndex < 0) {
     localCookiesEnabled.value.push(cookie)
   } else {
-    localCookiesEnabled.value.splice(
-      localCookiesEnabled.value.indexOf(cookie),
-      1
-    )
+    localCookiesEnabled.value.splice(cookieIndex, 1)
   }
 }
 const getDescription = (description: Translatable) =>
@@ -295,7 +306,7 @@ onBeforeMount(async () => {
     isColorsSet.value = true
   }
 
-  if (Cookies.get(moduleOptions.cookieNameIsConsentGiven) === 'true') {
+  if (getCookie(moduleOptions.cookieNameIsConsentGiven) === 'true') {
     for (const cookieOptional of moduleOptions.cookies.optional) {
       if (
         typeof moduleOptions.isIframeBlocked === 'boolean'
@@ -313,7 +324,7 @@ watch(
     localCookiesEnabled.value = [...(current || [])]
 
     if (isConsentGiven.value) {
-      Cookies.set(
+      setCookie(
         moduleOptions.cookieNameCookiesEnabledIds,
         getCookieIds(current || []).join(','),
         {
@@ -329,7 +340,7 @@ watch(
         document.getElementsByTagName('head')[0].appendChild(script)
       }
     } else {
-      Cookies.remove(moduleOptions.cookieNameCookiesEnabledIds)
+      removeCookie(moduleOptions.cookieNameCookiesEnabledIds)
     }
 
     // delete formerly enabled cookies that are now disabled
@@ -341,7 +352,7 @@ watch(
       if (!cookieOptionalDisabled.targetCookieIds) continue
 
       for (const cookieOptionalDisabledId of cookieOptionalDisabled.targetCookieIds) {
-        Cookies.remove(cookieOptionalDisabledId)
+        removeCookie(cookieOptionalDisabledId)
       }
 
       if (cookieOptionalDisabled.src) {
@@ -359,9 +370,9 @@ watch(
 )
 watch(isConsentGiven, (current, _previous) => {
   if (current === undefined) {
-    Cookies.remove(moduleOptions.cookieNameIsConsentGiven)
+    removeCookie(moduleOptions.cookieNameIsConsentGiven)
   } else {
-    Cookies.set(moduleOptions.cookieNameIsConsentGiven, current.toString(), {
+    setCookie(moduleOptions.cookieNameIsConsentGiven, current.toString(), {
       expires,
     })
   }

package/dist/runtime/methods.d.ts

@@ -1,4 +1,8 @@
 import { Cookie, Translatable } from './types';
+export declare const getCookie: (name: string) => any;
 export declare const getCookieId: (cookie: Cookie) => string;
 export declare const getCookieIds: (cookies: Cookie[]) => string[];
+export declare const removeCookie: (name: string) => any;
+export declare const resolveTranslatable: (translatable: Translatable, locale?: import("./types").Locale) => string;
+export declare const setCookie: (name: string, value: string, options: Cookies.CookieAttributes) => any;
 export declare const useResolveTranslatable: (locale?: import("./types").Locale) => (translatable: Translatable) => string;

package/dist/runtime/methods.mjs

@@ -1,11 +1,11 @@
+import Cookies from "js-cookie";
 import slugify from "@sindresorhus/slugify";
 import { LOCALE_DEFAULT } from "./constants.mjs";
+export const getCookie = (name) => Cookies.get(name);
 export const getCookieId = (cookie) => cookie.id || slugify(resolveTranslatable(cookie.name));
 export const getCookieIds = (cookies) => cookies.map((cookie) => getCookieId(cookie));
-export const useResolveTranslatable = (locale = LOCALE_DEFAULT) => {
-  return (translatable) => resolveTranslatable(translatable, locale);
-};
-const resolveTranslatable = (translatable, locale = LOCALE_DEFAULT) => {
+export const removeCookie = (name) => Cookies.remove(name);
+export const resolveTranslatable = (translatable, locale = LOCALE_DEFAULT) => {
   if (typeof translatable === "string")
     return translatable;
   if (!locale)
@@ -15,3 +15,7 @@ const resolveTranslatable = (translatable, locale = LOCALE_DEFAULT) => {
     throw new Error(`Could not get translation for locale ${locale}.`);
   return result;
 };
+export const setCookie = (name, value, options) => Cookies.set(name, value, options);
+export const useResolveTranslatable = (locale = LOCALE_DEFAULT) => {
+  return (translatable) => resolveTranslatable(translatable, locale);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-cookie-control",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "description": "Nuxt Cookies Control Module",
   "author": "Dario Ferderber <dario.ferderber@broj42.com>",
   "maintainers": [