@scayle/storefront-nuxt 7.51.2 → 7.53.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @scayle/storefront-nuxt
 
+## 7.53.0
+
+### Minor Changes
+
+- Nest public `runtimeConfig` properties under the `storefront` key
+
+  Breaking: `useRuntimeConfig().public.log` and `useRuntimeConfig().public.auth` should be replaced by `useRuntimeConfig().public.storefront.log` and `useRuntimeConfig().public.storefront.log`
+
+## 7.52.0
+
+### Minor Changes
+
+- Allow the session of an `RpcContext` to be undefined
+
+  BREAKING: This changes the structure of the `RpcContext`, so it may be a breaking change if you have written custom RPC methods.
+
+  The affected properties on the `RpcContext` are `sessionId`, `wishlistKey` and `basketKey` and the affected methods are `destroySession`, `createUserBoundSession`, `updateUser`, and `updateTokens`. If you use these methods or properties in a custom RPC method, make sure that you handle the case where they might be undefined. TypeScript will also catch these cases if you have `strictNullChecks` enabled.
+
+  You can check `context.sessionId` (or another session-dependent property) to determine if the session is present. If one of these properties is present, all will be. Alternatively, you can call `assertSession(context)` before referencing any properties on the context. If the session is not present, an error will be thrown. For any usage of `context` after `assertSession` is called, TypeScript will understand that the session properties are present.
+
+- Do not attach session for cached request
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-core@7.38.0
+
 ## 7.51.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.8b6c06b3.mjs';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.32ffc293.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 { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.8b6c06b3.js';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.32ffc293.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 ModuleOptions } from './shared/storefront-nuxt.8b6c06b3.mjs';
-export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.8b6c06b3.mjs';
+import { M as ModuleOptions } from './shared/storefront-nuxt.32ffc293.mjs';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.32ffc293.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 ModuleOptions } from './shared/storefront-nuxt.8b6c06b3.js';
-export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.8b6c06b3.js';
+import { M as ModuleOptions } from './shared/storefront-nuxt.32ffc293.js';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.32ffc293.js';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.9.0"
   },
-  "version": "7.51.1"
+  "version": "7.52.0"
 }

package/dist/module.mjs

@@ -100,12 +100,10 @@ const module = defineNuxtModule({
       nuxt.options.runtimeConfig.storefront,
       options
     );
-    nuxt.options.runtimeConfig.cache = {
-      auth: options.cache?.auth
+    nuxt.options.runtimeConfig.public.storefront = {
+      log: options.log,
+      auth: options.auth
     };
-    nuxt.options.runtimeConfig.public.publicShopData = options.publicShopData;
-    nuxt.options.runtimeConfig.public.log = options.log;
-    nuxt.options.runtimeConfig.public.auth = options.auth;
     extendViteConfig((config) => {
       config.optimizeDeps = config.optimizeDeps || {};
       config.optimizeDeps.include = config.optimizeDeps.include || [];

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.8b6c06b3.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.32ffc293.mjs';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 

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.8b6c06b3.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.32ffc293.js';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 

package/dist/runtime/composables/storefront/useBasket.d.ts

@@ -44,7 +44,7 @@ export declare function useBasket({ params, options, key, }?: UseBasketOptions):
         shopId: string;
         userId: string;
         log?: import("@scayle/storefront-core").Log | undefined;
-    }) => Promise<any>;
+    }) => Promise<string>;
     mergeBaskets: (args: {
         fromBasketKey: string;
         toBasketKey: string;

package/dist/runtime/context.d.ts

@@ -7,8 +7,8 @@ export interface ContextBuilderOptions {
     $shopConfig: ShopConfig;
     $storefront: StorefrontConfig;
     $log: Log;
-    sessionId: string;
-    session: Session;
+    sessionId?: string;
+    session?: Session;
     config: RuntimeConfig;
 }
 export declare const buildContext: (context: ContextBuilderOptions) => Promise<RpcContext>;

package/dist/runtime/context.mjs

@@ -4,8 +4,72 @@ import {
   generateBasketKey,
   generateWishlistKey
 } from "@scayle/storefront-core/dist/utils/keys";
+async function getWishlistKey(appKeys, session, $log, $shopConfig) {
+  return session.data.user ? await generateWishlistKey({
+    keyTemplate: appKeys.wishlistKey,
+    userId: String(session.data.user.id),
+    shopId: String($shopConfig.shopId),
+    hashAlgorithm: appKeys.hashAlgorithm,
+    log: $log
+  }) : session.id;
+}
+async function getBasketKey(appKeys, session, $log, $shopConfig) {
+  return session.data.user ? await generateBasketKey({
+    keyTemplate: appKeys.basketKey,
+    userId: String(session.data.user.id),
+    shopId: String($shopConfig.shopId),
+    hashAlgorithm: appKeys.hashAlgorithm,
+    log: $log
+  }) : session?.id;
+}
+async function sessionProperties(context) {
+  const { $shopConfig, $storefront, $log, session } = context;
+  const appKeys = $shopConfig.appKeys ?? $storefront.appKeys;
+  if (session) {
+    return {
+      wishlistKey: await getWishlistKey(appKeys, session, $log, $shopConfig),
+      basketKey: await getBasketKey(appKeys, session, $log, $shopConfig),
+      sessionId: session.id,
+      get user() {
+        return session.data?.user ?? void 0;
+      },
+      get accessToken() {
+        return session.data?.accessToken ?? void 0;
+      },
+      destroySession: async () => {
+        await session.destroy();
+      },
+      createUserBoundSession: async () => {
+        $log.debug("creating user bound session");
+        const data = session.data;
+        await session.regenerate();
+        session.data = data;
+        await session.save();
+      },
+      updateUser: async (user) => {
+        session.data.user = user;
+        await session.save();
+      },
+      updateTokens: async (tokens) => {
+        Object.assign(session.data, tokens);
+        await session.save();
+      }
+    };
+  }
+  return {
+    wishlistKey: void 0,
+    basketKey: void 0,
+    sessionId: void 0,
+    user: void 0,
+    accessToken: void 0,
+    destroySession: void 0,
+    createUserBoundSession: void 0,
+    updateUser: void 0,
+    updateTokens: void 0
+  };
+}
 export const buildContext = async (context) => {
-  const { $cache, $shopConfig, $storefront, $log, session, config } = context;
+  const { $cache, $shopConfig, $storefront, $log, config } = context;
   const bapiConfig = $shopConfig.bapi ?? $storefront.bapi;
   const appKeys = $shopConfig.appKeys ?? $storefront.appKeys;
   const idpConfig = $shopConfig.idp ?? $storefront.idp;
@@ -17,20 +81,7 @@ export const buildContext = async (context) => {
       authentication: "token",
       token: bapiConfig.token
     }),
-    wishlistKey: session.data.user ? await generateWishlistKey({
-      keyTemplate: appKeys.wishlistKey,
-      userId: String(session.data.user.id),
-      shopId: String($shopConfig.shopId),
-      hashAlgorithm: appKeys.hashAlgorithm,
-      log: $log
-    }) : session.id,
-    basketKey: session.data.user ? await generateBasketKey({
-      keyTemplate: appKeys.basketKey,
-      userId: String(session.data.user.id),
-      shopId: String($shopConfig.shopId),
-      hashAlgorithm: appKeys.hashAlgorithm,
-      log: $log
-    }) : session.id,
+    ...await sessionProperties(context),
     auth: {
       resetPasswordUrl: $shopConfig.auth?.resetPasswordUrl
     },
@@ -48,21 +99,8 @@ export const buildContext = async (context) => {
     },
     idp: idpConfig,
     log: $log,
-    get user() {
-      return session.data?.user ?? void 0;
-    },
-    destroySession: async () => {
-      await session.destroy();
-    },
     destroySessionsForUserId: async () => {
     },
-    createUserBoundSession: async () => {
-      $log.debug("creating user bound session");
-      const data = session.data;
-      await session.regenerate();
-      session.data = data;
-      await session.save();
-    },
     generateBasketKeyForUserId: (userId) => generateBasketKey({
       keyTemplate: appKeys.basketKey,
       userId,
@@ -83,18 +121,6 @@ export const buildContext = async (context) => {
     domain: $shopConfig.domain,
     withParams: $storefront.withParams,
     campaignKey: $shopConfig.storeCampaignKeyword,
-    updateUser: async (user) => {
-      session.data.user = user;
-      await session.save();
-    },
-    sessionId: context.sessionId,
-    get accessToken() {
-      return session.data?.accessToken ?? void 0;
-    },
-    updateTokens: async (tokens) => {
-      Object.assign(session.data, tokens);
-      await session.save();
-    },
     runtimeConfiguration: config
   };
 };

package/dist/runtime/plugin/log.client.mjs

@@ -3,7 +3,11 @@ import { createConsola } from "consola/browser";
 import createLog from "../createLog.mjs";
 export default defineNuxtPlugin((nuxtApp) => {
   const config = useRuntimeConfig().public;
-  const log = createLog(createConsola, config.log.name, config.log.level);
+  const log = createLog(
+    createConsola,
+    config.storefront.log.name,
+    config.storefront.log.level
+  );
   const coreLog = log.space("sfc");
   coreLog.debug("Attached client-side logger");
   addClientSideErrorHandling(log, nuxtApp.vueApp);

package/dist/runtime/server/middleware/bootstrap.mjs

@@ -85,13 +85,17 @@ async function bootstrap(event, url, $shopConfig, $storefrontConfig, apiBasePath
   );
   event.context.$cache = $cache;
   bootstrapLog.debug("Building context for request");
+  const cacheableRoute = !!event.context._nitro.routeRules.cache;
+  if (cacheableRoute) {
+    bootstrapLog.debug("Skipping session for cached request");
+  }
   event.context.$rpcContext = await buildContext({
     $cache,
     $shopConfig,
     $storefront: $storefrontConfig,
     $log: log,
-    sessionId: event.context.sessionId,
-    session: event.context.session,
+    sessionId: cacheableRoute ? void 0 : event.context.sessionId,
+    session: cacheableRoute ? void 0 : event.context.session,
     config
   });
 }

package/dist/shared/{storefront-nuxt.8b6c06b3.d.mts → storefront-nuxt.32ffc293.d.mts}

@@ -175,12 +175,13 @@ declare module '@nuxt/schema' {
         storefront: ModuleOptions;
     }
     interface PublicRuntimeConfig {
-        imageBaseUrl: string;
-        log: {
-            name: string;
-            level: LogLevel;
+        storefront: {
+            log: {
+                name: string;
+                level: LogLevel;
+            };
+            auth: AuthenticationConfig;
         };
-        auth: AuthenticationConfig;
     }
 }
 

package/dist/shared/{storefront-nuxt.8b6c06b3.d.ts → storefront-nuxt.32ffc293.d.ts}

@@ -175,12 +175,13 @@ declare module '@nuxt/schema' {
         storefront: ModuleOptions;
     }
     interface PublicRuntimeConfig {
-        imageBaseUrl: string;
-        log: {
-            name: string;
-            level: LogLevel;
+        storefront: {
+            log: {
+                name: string;
+                level: LogLevel;
+            };
+            auth: AuthenticationConfig;
         };
-        auth: AuthenticationConfig;
     }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.51.2",
+  "version": "7.53.0",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -62,11 +62,11 @@
   "dependencies": {
     "@nuxt/kit": "3.9.3",
     "@scayle/h3-session": "0.3.5",
-    "@scayle/storefront-core": "7.37.0",
+    "@scayle/storefront-core": "7.38.0",
     "@scayle/unstorage-compression-driver": "0.1.1",
     "@vueuse/core": "10.7.2",
     "consola": "3.2.3",
-    "core-js": "3.35.0",
+    "core-js": "3.35.1",
     "defu": "6.1.4",
     "h3": "1.10.0",
     "jose": "^5.2.0",