@scayle/storefront-nuxt 7.83.0 → 7.84.1

package/CHANGELOG.md

@@ -1,11 +1,32 @@
 # @scayle/storefront-nuxt
 
+## 7.84.1
+
+### Patch Changes
+
+- Improve typing of `H3EventContext` and `Session.data`
+
+## 7.84.0
+
+### Minor Changes
+
+- Migrate from `ModuleBaseOptions.stores` to `ModuleBaseOptions.shops`
+
 ## 7.83.0
 
 ### Minor Changes
 
+- Introduce `disableDefaultGetCachedDataOverride` flag in the public runtime configuration. Setting this to true prevents `useRpc` from sharing data across multiple instances.
+  Important: The `disableDefaultGetCachedDataOverride` flag currently does not affect the `useUser`, `useBasket`, and `useWishlist` composables. These composables will continue to share a common cache even when `disableDefaultGetCachedDataOverride` is set to true.
 - Deprecate `useQueryFilterState` in the `@scayle/storefront-nuxt` package
 
+### Patch Changes
+
+- Remove `shopCampaignKeyword` from ShopConfigSchema
+- Migrate from using `RpcContext.bapiClient` to using `RpcContext.sapiClient`
+- Updated dependencies
+  - @scayle/storefront-core@7.63.0
+
 ## 7.82.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.87331293.mjs';
+export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.d852fe87.mjs';
 export { rpcCall } from './rpc.mjs';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.87331293.js';
+export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.d852fe87.js';
 export { rpcCall } from './rpc.js';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';

package/dist/module.d.mts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleBaseOptions } from './shared/storefront-nuxt.87331293.mjs';
-export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.87331293.mjs';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.d852fe87.mjs';
+export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.d852fe87.mjs';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/module.d.ts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleBaseOptions } from './shared/storefront-nuxt.87331293.js';
-export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.87331293.js';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.d852fe87.js';
+export { e as AdditionalShopConfig, A as AppKeys, B as BapiConfig, i as CheckoutEvent, C as CheckoutShopConfig, j as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, d as SapiConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.d852fe87.js';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-nuxt",
-  "version": "7.83.0",
+  "version": "7.84.1",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -8,11 +8,11 @@ import { createConsola } from 'consola';
 import 'h3';
 import { joinURL } from 'ufo';
 
-const convertShopsToList = (stores) => {
-  if (Array.isArray(stores)) {
-    return stores;
+const convertShopsToList = (shops) => {
+  if (Array.isArray(shops)) {
+    return shops;
   }
-  return Object.values(stores);
+  return Object.values(shops);
 };
 function getApiBasePath(storefrontConfig, shop, baseUrl) {
   const path = Array.isArray(shop.path) ? shop.path[0] : shop.path;
@@ -33,7 +33,8 @@ function getApiBasePath(storefrontConfig, shop, baseUrl) {
 function getUsedDrivers(options) {
   const drivers = /* @__PURE__ */ new Set();
   drivers.add("memory");
-  if (options.redis || Object.values(options.stores).some((store) => store.redis)) {
+  const shops = ("shops" in options ? options.shops : options.stores) ?? {};
+  if (options.redis || Object.values(shops).some((shop) => shop.redis)) {
     drivers.add("redis");
   }
   const addDriver = (config) => {
@@ -45,8 +46,8 @@ function getUsedDrivers(options) {
     }
   };
   addDriver(options.storage);
-  Object.values(options.stores).forEach((store) => {
-    addDriver(store.storage);
+  Object.values(shops).forEach((shop) => {
+    addDriver(shop.storage);
   });
   return Array.from(drivers);
 }
@@ -65,7 +66,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.83.0";
+const PACKAGE_VERSION = "7.84.1";
 const logger = createConsola({
   fancy: true,
   formatOptions: {
@@ -99,7 +100,6 @@ const module = defineNuxtModule({
       // maxAge: undefined,
     },
     shopSelector: "domain",
-    stores: {},
     oauth: {
       apiHost: "",
       clientId: "",
@@ -190,7 +190,7 @@ Missing RPC Overrides: ${Array.from(overridenRPCMethodNames).map((name) => `'${n
       });
     }
     const shops = convertShopsToList(
-      nuxt.options.runtimeConfig.storefront.stores
+      ("shops" in nuxt.options.runtimeConfig.storefront ? nuxt.options.runtimeConfig.storefront.shops : nuxt.options.runtimeConfig.storefront.stores) ?? {}
     );
     const shopSelector = nuxt.options.runtimeConfig.storefront.shopSelector;
     if (shopSelector === "path" || shopSelector === "path_or_default") {

package/dist/rpc.d.mts

@@ -1,6 +1,6 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.87331293.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.d852fe87.mjs';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 import 'zod';

package/dist/rpc.d.ts

@@ -1,6 +1,6 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.87331293.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.d852fe87.js';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 import 'zod';

package/dist/runtime/api/cacheAuth.mjs

@@ -1,3 +1,4 @@
+import { Buffer } from "node:buffer";
 import {
   getRequestHeaders,
   defineEventHandler,

package/dist/runtime/composables/core/useIDP.mjs

@@ -1,12 +1,7 @@
-import { useNuxtApp } from "nuxt/app";
 import { useRpc } from "../core/useRpc.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
-import { rpcCall } from "./../../rpc/rpcCall.mjs";
-import { useCurrentShop } from "./useCurrentShop.mjs";
-import { toValue } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useIDP(params = {}, key) {
-  const nuxtApp = useNuxtApp();
-  const shop = useCurrentShop();
   const useRpcPromise = useRpc(
     "getExternalIdpRedirect",
     key ?? "useIDP",
@@ -20,11 +15,7 @@ export function useIDP(params = {}, key) {
     refresh,
     status
   } = useRpcPromise;
-  const handleIDPLoginCallback = rpcCall(
-    nuxtApp,
-    "handleIDPLoginCallback",
-    toValue(shop)
-  );
+  const handleIDPLoginCallback = useRpcCall("handleIDPLoginCallback");
   return extendPromise(useRpcPromise.then(() => ({})), {
     data,
     fetch,

package/dist/runtime/composables/core/useRpc.mjs

@@ -4,6 +4,7 @@ import { useCoreLog } from "../useCoreLog.mjs";
 import { useCurrentShop } from "./useCurrentShop.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
 import { toValue, computed, isRef } from "#imports";
+import { useRuntimeConfig } from "#app/nuxt";
 function getFetch(nuxtApp, log) {
   const fetch = nuxtApp.ssrContext?.event.$fetch ?? $fetch;
   if (nuxtApp.ssrContext?.event && !nuxtApp.ssrContext?.event.$fetch) {
@@ -15,6 +16,7 @@ export function useRpc(method, key, params, options) {
   const currentShop = useCurrentShop();
   const log = useCoreLog("rpc");
   const nuxtApp = useNuxtApp();
+  const { public: { storefront: { disableDefaultGetCachedDataOverride } } } = useRuntimeConfig();
   if (options && options.autoFetch !== void 0) {
     log.warn("autoFetch is disabled; use immediate instead");
     if (options.immediate === void 0) {
@@ -45,7 +47,7 @@ export function useRpc(method, key, params, options) {
     {
       // Both refs and getter functions are valid watch sources
       ...isRef(params) || typeof params === "function" ? { watch: [params] } : {},
-      getCachedData(key2, nuxtApp2) {
+      getCachedData: disableDefaultGetCachedDataOverride ? void 0 : (key2, nuxtApp2) => {
         const hydrationData = nuxtApp2.isHydrating ? nuxtApp2.payload.data[key2] : nuxtApp2.static.data[key2];
         return hydrationData ?? nuxtApp2._asyncData[key2]?.data.value;
       },

package/dist/runtime/composables/core/useSession.mjs

@@ -1,22 +1,15 @@
-import { useNuxtApp } from "nuxt/app";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
-import { useCurrentShop } from "./useCurrentShop.mjs";
-import { toValue } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useSession() {
-  const nuxtApp = useNuxtApp();
-  const shop = useCurrentShop();
   return {
-    login: rpcCall(nuxtApp, "oauthLogin", toValue(shop)),
-    register: rpcCall(nuxtApp, "oauthRegister", toValue(shop)),
-    guestLogin: rpcCall(nuxtApp, "oauthGuestLogin", toValue(shop)),
-    refreshToken: rpcCall(nuxtApp, "refreshAccessToken", toValue(shop)),
-    revokeToken: rpcCall(nuxtApp, "oauthRevokeToken", toValue(shop)),
-    forgetPassword: rpcCall(nuxtApp, "oauthForgetPassword", toValue(shop)),
-    resetPasswordByHash: rpcCall(
-      nuxtApp,
-      "updatePasswordByHash",
-      toValue(shop)
+    login: useRpcCall("oauthLogin"),
+    register: useRpcCall("oauthRegister"),
+    guestLogin: useRpcCall("oauthGuestLogin"),
+    refreshToken: useRpcCall("refreshAccessToken"),
+    revokeToken: useRpcCall("oauthRevokeToken"),
+    forgetPassword: useRpcCall("oauthForgetPassword"),
+    resetPasswordByHash: useRpcCall(
+      "updatePasswordByHash"
     ),
-    loginWithIDP: rpcCall(nuxtApp, "handleIDPLoginCallback", toValue(shop))
+    loginWithIDP: useRpcCall("handleIDPLoginCallback")
   };
 }

package/dist/runtime/composables/core/useUser.mjs

@@ -1,15 +1,16 @@
 import { useNuxtApp } from "nuxt/app";
 import { computed } from "vue";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
 import { useCoreLog } from "../useCoreLog.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
 import { useRpc } from "./useRpc.mjs";
-import { useCurrentShop } from "./useCurrentShop.mjs";
 import { toValue } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useUser(options = {}) {
   const nuxtApp = useNuxtApp();
-  const shop = useCurrentShop();
   const log = useCoreLog("useUser");
+  const updateUserRpc = useRpcCall("updateShopUser");
+  const updatePasswordRpc = useRpcCall("updatePassword");
+  const refreshUserRpc = useRpcCall("refreshUser");
   if (options && options.autoFetch !== void 0) {
     log.warn("autoFetch is disabled; use immediate instead");
     if (options.immediate === void 0) {
@@ -40,19 +41,11 @@ export function useUser(options = {}) {
   const { data, fetching, fetch, error, status } = asyncDataPromise;
   const updateUser = async (payload) => {
     log.debug("Update user");
-    data.value = await rpcCall(
-      nuxtApp,
-      "updateShopUser",
-      toValue(shop)
-    )(payload);
+    data.value = await updateUserRpc(payload);
   };
   const updatePassword = async (payload) => {
     log.debug("Update password");
-    const response = await rpcCall(
-      nuxtApp,
-      "updatePassword",
-      toValue(shop)
-    )(payload);
+    const response = await updatePasswordRpc(payload);
     if (response) {
       data.value = response;
     }
@@ -67,7 +60,7 @@ export function useUser(options = {}) {
   });
   const forceRefresh = async () => {
     log.debug("Refresh user");
-    data.value = await rpcCall(nuxtApp, "refreshUser", toValue(shop))();
+    data.value = await refreshUserRpc();
   };
   return extendPromise(asyncDataPromise.then(() => ({})), {
     user,

package/dist/runtime/composables/storefront/useBasket.mjs

@@ -8,17 +8,20 @@ import {
 } from "@scayle/storefront-core";
 import { useNuxtApp } from "nuxt/app";
 import { computed } from "vue";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
 import { useRpc } from "../core/useRpc.mjs";
-import { useCurrentShop } from "../core/useCurrentShop.mjs";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 import { toValue, toRef } from "#imports";
 export function useBasket({
   params,
   key = "useBasket"
 } = {}) {
   const nuxtApp = useNuxtApp();
-  const shop = useCurrentShop();
+  const addItemToBasketRpc = useRpcCall("addItemToBasket");
+  const addItemsToBasketRpc = useRpcCall("addItemsToBasket");
+  const mergeBasketsRpc = useRpcCall("mergeBaskets");
+  const clearBasketRpc = useRpcCall("clearBasket");
+  const removeItemFromBasketRpc = useRpcCall("removeItemFromBasket");
   const asyncData = useRpc("getBasket", key, params, {
     server: false,
     // TODO: In some cases it might be ok to fetch on server
@@ -44,11 +47,7 @@ export function useBasket({
     customData,
     itemGroup
   }) => {
-    data.value = await rpcCall(
-      nuxtApp,
-      "addItemToBasket",
-      toValue(shop)
-    )({
+    data.value = await addItemToBasketRpc({
       promotionId,
       variantId,
       quantity,
@@ -60,22 +59,14 @@ export function useBasket({
     });
   };
   const addItems = async (items2, existingItemHandling = ExistingItemHandling.AddQuantityToExisting) => {
-    data.value = await rpcCall(
-      nuxtApp,
-      "addItemsToBasket",
-      toValue(shop)
-    )({
+    data.value = await addItemsToBasketRpc({
       items: items2,
       existingItemHandling,
       with: toValue(params)
     });
   };
   const mergeBaskets = async (args) => {
-    return await rpcCall(
-      nuxtApp,
-      "mergeBaskets",
-      toValue(shop)
-    )({
+    return await mergeBasketsRpc({
       ...args,
       with: toValue(params)
     });
@@ -100,17 +91,13 @@ export function useBasket({
         `Could not find basket item by variant-id: ${item.variantId}`
       );
     }
-    data.value = await rpcCall(
-      nuxtApp,
-      "removeItemFromBasket",
-      toValue(shop)
-    )({
+    data.value = await removeItemFromBasketRpc({
       itemKey: element.key,
       with: toValue(params)
     });
   };
   const clear = async () => {
-    await rpcCall(nuxtApp, "clearBasket", toValue(shop))();
+    await clearBasketRpc();
   };
   const products = computed(
     () => data.value?.items.map((item) => item.product) || []

package/dist/runtime/composables/storefront/useCategories.mjs

@@ -1,26 +1,18 @@
-import { useNuxtApp } from "nuxt/app";
 import { useRpc } from "../core/useRpc.mjs";
-import { useCurrentShop } from "../core/useCurrentShop.mjs";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useCategories({
   params,
   options,
   key: _key
 } = {}, key) {
-  const currentShop = useCurrentShop();
-  const nuxtApp = useNuxtApp();
   const useRpcPromise = useRpc(
     "getCategoriesByPath",
     _key ?? key ?? "useCategories",
     params,
     options
   );
-  const getCategoryById = rpcCall(
-    nuxtApp,
-    "getCategoryById",
-    currentShop.value ?? void 0
-  );
+  const getCategoryById = useRpcCall("getCategoryById");
   const {
     data,
     error,

package/dist/runtime/composables/storefront/useCurrentPromotions.mjs

@@ -8,6 +8,12 @@ export function useCurrentPromotions({
     "getCurrentPromotions",
     _key ?? key ?? "useCurrentPromotions",
     params,
-    options
+    {
+      getCachedData(key2, nuxtApp) {
+        const hydrationData = nuxtApp.isHydrating ? nuxtApp.payload.data[key2] : nuxtApp.static.data[key2];
+        return hydrationData ?? nuxtApp._asyncData[key2]?.data.value;
+      },
+      ...options
+    }
   );
 }

package/dist/runtime/composables/storefront/useSearch.mjs

@@ -1,18 +1,15 @@
 import { useState } from "nuxt/app";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
-import { useCurrentShop } from "../core/useCurrentShop.mjs";
-import { useNuxtApp, toValue } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useSearch({ params, key = "search" } = {}) {
   const data = useState(
     `${key}-data`,
     () => void 0
   );
-  const nuxtApp = useNuxtApp();
   const searchQuery = useState(`${key}-searchQuery`, () => "");
   const pending = useState(`${key}-pending`, () => false);
   const error = useState(`${key}-error`, () => void 0);
   const status = useState(`${key}-error`, () => "idle");
-  const shop = useCurrentShop();
+  const searchProductsRpc = useRpcCall("searchProducts");
   const search = async ({ term, slug, productLimit }) => {
     pending.value = true;
     status.value = "pending";
@@ -20,11 +17,7 @@ export function useSearch({ params, key = "search" } = {}) {
       return;
     }
     try {
-      data.value = await rpcCall(
-        nuxtApp,
-        "searchProducts",
-        toValue(shop)
-      )({
+      data.value = await searchProductsRpc({
         term: String(term),
         slug,
         with: params?.with,

package/dist/runtime/composables/storefront/useStorefrontSearch.mjs

@@ -1,20 +1,18 @@
 import { useState } from "nuxt/app";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
-import { useCurrentShop } from "../core/useCurrentShop.mjs";
-import { useNuxtApp, toValue } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useStorefrontSearch(searchQuery, { params, key = "search" } = {}) {
   const data = useState(
     `${key}-data`,
     () => void 0
   );
-  const nuxtApp = useNuxtApp();
+  const getSearchSuggestionsRpc = useRpcCall("getSearchSuggestions");
+  const resolveSearchRpc = useRpcCall("resolveSearch");
   const pending = useState(`${key}-pending`, () => false);
   const error = useState(
     `${key}-error`,
     () => void 0
   );
   const status = useState(`${key}-error`, () => "idle");
-  const shop = useCurrentShop();
   const getSearchSuggestions = async () => {
     pending.value = true;
     status.value = "pending";
@@ -22,11 +20,7 @@ export function useStorefrontSearch(searchQuery, { params, key = "search" } = {}
       return;
     }
     try {
-      data.value = await rpcCall(
-        nuxtApp,
-        "getSearchSuggestions",
-        toValue(shop)
-      )({
+      data.value = await getSearchSuggestionsRpc({
         term: String(searchQuery.value),
         ...params
       });
@@ -41,11 +35,7 @@ export function useStorefrontSearch(searchQuery, { params, key = "search" } = {}
     if (!searchQuery.value) {
       return;
     }
-    return await rpcCall(
-      nuxtApp,
-      "resolveSearch",
-      toValue(shop)
-    )({
+    return await resolveSearchRpc({
       term: searchQuery.value,
       ...params
     });

package/dist/runtime/composables/storefront/useWishlist.mjs

@@ -5,17 +5,18 @@ import {
 } from "@scayle/storefront-core";
 import { useNuxtApp } from "nuxt/app";
 import { computed } from "vue";
-import { rpcCall } from "../../rpc/rpcCall.mjs";
 import { useRpc } from "../core/useRpc.mjs";
 import { extendPromise } from "../../utils/promise.mjs";
-import { useCurrentShop } from "../core/useCurrentShop.mjs";
 import { toValue, toRef } from "#imports";
+import { useRpcCall } from "../core/useRpcCall.mjs";
 export function useWishlist({
   params,
   key = "useWishlist"
 } = {}) {
   const nuxtApp = useNuxtApp();
-  const shop = useCurrentShop();
+  const addItemToWishlistRpc = useRpcCall("addItemToWishlist");
+  const removeItemFromWishlistRpc = useRpcCall("removeItemFromWishlist");
+  const clearWishlistRpc = useRpcCall("clearWishlist");
   const asyncData = useRpc(
     "getWishlist",
     key,
@@ -38,11 +39,7 @@ export function useWishlist({
     status
   } = asyncData;
   const addItem = async (item) => {
-    data.value = await rpcCall(
-      nuxtApp,
-      "addItemToWishlist",
-      toValue(shop)
-    )({
+    data.value = await addItemToWishlistRpc({
       ...item,
       with: toValue(params)
     });
@@ -56,11 +53,7 @@ export function useWishlist({
         "Could not find wishlist item."
       );
     }
-    data.value = await rpcCall(
-      nuxtApp,
-      "removeItemFromWishlist",
-      toValue(shop)
-    )({
+    data.value = await removeItemFromWishlistRpc({
       itemKey: element.key,
       with: toValue(params)
     });
@@ -74,25 +67,17 @@ export function useWishlist({
         `Could not find wishlist item by: ${JSON.stringify(item)}`
       );
     }
-    await rpcCall(
-      nuxtApp,
-      "removeItemFromWishlist",
-      toValue(shop)
-    )({
+    await removeItemFromWishlistRpc({
       with: toValue(params),
       itemKey: element.key
     });
-    data.value = await rpcCall(
-      nuxtApp,
-      "addItemToWishlist",
-      toValue(shop)
-    )({
+    data.value = await addItemToWishlistRpc({
       ...newItem,
       with: toValue(params)
     });
   };
   const clear = async () => {
-    data.value = await rpcCall(nuxtApp, "clearWishlist", toValue(shop))();
+    data.value = await clearWishlistRpc();
   };
   const findItem = (item) => {
     return data.value?.items?.find((entry) => {

package/dist/runtime/nitro/plugins/configValidation.d.ts

@@ -1,3 +1,7 @@
+import type { RuntimeConfig } from '@nuxt/schema';
+import type { ZodIssue } from 'zod';
 export declare const sensitiveKeys: string[];
+export declare const getValue: (object: any, pathArray: any) => string;
+export declare const formatZodError: (issues: Array<ZodIssue>, runtimeConfig: RuntimeConfig) => never[];
 declare const _default: any;
 export default _default;

package/dist/runtime/nitro/plugins/configValidation.mjs

@@ -8,12 +8,12 @@ export const sensitiveKeys = [
   "apiToken",
   "secret"
 ];
-const getValue = (object, pathArray) => {
+export const getValue = (object, pathArray) => {
   return String(pathArray.reduce((acc, key) => {
     return acc ? acc[key] : void 0;
   }, object));
 };
-const formatZodError = (issues, runtimeConfig) => {
+export const formatZodError = (issues, runtimeConfig) => {
   const errorMessages = [];
   issues.forEach((issue) => {
     if (issue.code === "invalid_union") {

package/dist/runtime/nitro/plugins/nitroRuntimeStorageConfig.mjs

@@ -121,9 +121,10 @@ function getShopSessionConfig(config, shop, log) {
 export default defineNitroPlugin(() => {
   const storage = useStorage();
   const config = useRuntimeConfig();
+  const storefront = config.storefront;
   const logConfig = config.public.storefront.log;
   const log = createLog(createConsola, logConfig.name, logConfig.level);
-  const shops = config.storefront.stores;
+  const shops = "shops" in storefront ? storefront.shops : storefront.stores;
   try {
     const globalCacheConfig = getCacheConfig(config, log);
     mountStorage(storage, {

package/dist/runtime/server/middleware/bootstrap.d.ts

@@ -1,4 +1,4 @@
-import type { RpcContext, Cache } from '@scayle/storefront-core';
+import type { RpcContext, Cache, ShopUser } from '@scayle/storefront-core';
 import type { PublicShopConfig } from '../../../module';
 declare module 'h3' {
     interface H3EventContext {
@@ -8,5 +8,15 @@ declare module 'h3' {
         $availableShops: PublicShopConfig[];
     }
 }
+export interface ShopSessionData {
+    user?: ShopUser;
+    accessToken?: string;
+    refreshToken?: string;
+    shopId?: number;
+}
+declare module '@scayle/h3-session' {
+    interface SessionDataT extends ShopSessionData {
+    }
+}
 declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;
 export default _default;