@scayle/storefront-nuxt 7.72.4 → 7.73.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @scayle/storefront-nuxt
 
+## 7.73.0
+
+### Minor Changes
+
+- Renamed ModuleOptions to ModuleBaseOptions to differentiate it from other ModuleOptions used in different modules.
+
+### Patch Changes
+
+- Fix construction of API base path: When setting up a `baseURL` in combination with path based shop selection, the `baseURL` is now the first path segment of the API base path.
+- Updated dependencies
+  - @scayle/storefront-core@7.54.0
+
+## 7.72.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-core@7.53.0
+
 ## 7.72.4
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.20d8641a.mjs';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.d9a4c377.mjs';
 export { rpcCall } from './rpc.mjs';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';
@@ -6,6 +6,7 @@ export { unwrap } from '@scayle/storefront-core/dist/utils/response';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 import 'nuxt/app';
 
 interface RpcMethodsStorefront {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.20d8641a.js';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.d9a4c377.js';
 export { rpcCall } from './rpc.js';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';
@@ -6,6 +6,7 @@ export { unwrap } from '@scayle/storefront-core/dist/utils/response';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 import 'nuxt/app';
 
 interface RpcMethodsStorefront {

package/dist/module.d.mts

@@ -1,10 +1,11 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/storefront-nuxt.20d8641a.mjs';
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.20d8641a.mjs';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.d9a4c377.mjs';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.d9a4c377.mjs';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
+declare const _default: _nuxt_schema.NuxtModule<ModuleBaseOptions>;
 
-export { ModuleOptions, _default as default };
+export { ModuleBaseOptions, _default as default };

package/dist/module.d.ts

@@ -1,10 +1,11 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/storefront-nuxt.20d8641a.js';
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.20d8641a.js';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.d9a4c377.js';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.d9a4c377.js';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
+declare const _default: _nuxt_schema.NuxtModule<ModuleBaseOptions>;
 
-export { ModuleOptions, _default as default };
+export { ModuleBaseOptions, _default as default };

package/dist/module.json

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

package/dist/module.mjs

@@ -6,6 +6,7 @@ import { genImport, genSafeVariableName } from 'knitwork';
 import { builtinDrivers } from 'unstorage';
 import { createConsola } from 'consola';
 import 'h3';
+import { joinURL } from 'ufo';
 
 const convertShopsToList = (stores) => {
   if (Array.isArray(stores)) {
@@ -13,17 +14,19 @@ const convertShopsToList = (stores) => {
   }
   return Object.values(stores);
 };
-function getApiBasePath(storefrontConfig, shop) {
+function getApiBasePath(storefrontConfig, shop, baseUrl) {
   const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
   if (storefrontConfig.shopSelector === "path") {
-    return `/${shop.path}${apiPath}`;
+    const pathElements = [shop.path, apiPath].filter(Boolean);
+    return joinURL(baseUrl, ...pathElements);
   } else if (storefrontConfig.shopSelector === "path_or_default") {
     if (shop.isDefault) {
-      return apiPath;
+      return joinURL(baseUrl, apiPath);
     }
-    return `/${shop.path}${apiPath}`;
+    const pathElements = [shop.path, apiPath].filter(Boolean);
+    return joinURL(baseUrl, ...pathElements);
   }
-  return apiPath;
+  return joinURL(baseUrl, apiPath);
 }
 
 function getUsedDrivers(options) {
@@ -61,7 +64,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.72.3";
+const PACKAGE_VERSION = "7.72.5";
 const logger = createConsola({
   fancy: true,
   formatOptions: {
@@ -195,7 +198,13 @@ Missing RPC Overrides: ${Array.from(overridenRPCMethodNames).map((name) => `'${n
     const shopSelector = nuxt.options.runtimeConfig.storefront.shopSelector;
     if (shopSelector === "path" || shopSelector === "path_or_default") {
       shops.forEach((shop) => {
-        const base = getApiBasePath(nuxt.options.runtimeConfig.storefront, shop);
+        const base = getApiBasePath(
+          nuxt.options.runtimeConfig.storefront,
+          shop,
+          // Nuxt/Nitro automatically adds `NUXT_APP_BASE_URL` to the path when registering the handler, so we don't need to pass it here.
+          // https://github.com/unjs/nitro/blob/011280178d59fa863b90d63f89f29beb47b520b7/src/runtime/internal/app.ts#L149C13-L149C27
+          "/"
+        );
         addCacheServerHandlers(base);
         addRPCServerHandlers(base);
       });

package/dist/rpc.d.mts

@@ -1,9 +1,10 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.20d8641a.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.d9a4c377.mjs';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 
 /**
  * rpcCall can be used to invoke an RPC method either on the client or server

package/dist/rpc.d.ts

@@ -1,9 +1,10 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.20d8641a.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.d9a4c377.js';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
+import 'zod';
 
 /**
  * rpcCall can be used to invoke an RPC method either on the client or server

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

@@ -1,2 +1,3 @@
+export declare const sensitiveKeys: string[];
 declare const _default: any;
 export default _default;

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

@@ -1,16 +1,51 @@
 import { defineNitroPlugin, useRuntimeConfig } from "#imports";
-import { runtimeConfigSchema } from "../../utils/zodSchema.mjs";
+import { RuntimeConfigSchema } from "../../utils/zodSchema.mjs";
+import { purifySensitiveValue } from "@scayle/storefront-core";
+export const sensitiveKeys = [
+  "token",
+  "password",
+  "clientSecret",
+  "apiToken",
+  "secret"
+];
+const getValue = (object, pathArray) => {
+  return String(pathArray.reduce((acc, key) => {
+    return acc ? acc[key] : void 0;
+  }, object));
+};
+const formatZodError = (issues, runtimeConfig) => {
+  const errorMessages = [];
+  issues.forEach((issue) => {
+    if (issue.code === "invalid_union") {
+      return issue.unionErrors.forEach((unionError) => {
+        errorMessages.push(...formatZodError(unionError.errors, runtimeConfig));
+      });
+    }
+    const key = issue.path[issue.path.length - 1];
+    let value;
+    if (sensitiveKeys.includes(key)) {
+      value = purifySensitiveValue(getValue(runtimeConfig, issue.path), true);
+    } else if (issue.code !== "too_small") {
+      value = getValue(runtimeConfig, issue.path);
+    }
+    const errorMessage = {
+      code: issue.code,
+      path: issue.path.join("."),
+      message: issue.message
+    };
+    if (value) {
+      errorMessage.value = value;
+    }
+    errorMessages.push(errorMessage);
+  });
+  return errorMessages;
+};
 export default defineNitroPlugin(() => {
   const runtimeConfig = useRuntimeConfig();
-  const { success, error } = runtimeConfigSchema.safeParse(runtimeConfig);
+  const { success, error } = RuntimeConfigSchema.safeParse(runtimeConfig);
   if (!success) {
-    error.errors.forEach((e) => {
-      console.error("[storefront-nuxt] configValidation:", {
-        code: e.code,
-        path: e.path.join("."),
-        message: e.message
-      });
-    });
+    const errorMessages = formatZodError(error.errors, runtimeConfig);
+    console.error("[storefront-nuxt] configValidation:", errorMessages);
     throw Error("[storefront-nuxt] configValidation: Runtime config invalid");
   }
   console.log("[storefront-nuxt] configValidation: Runtime config valid");

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

@@ -135,14 +135,15 @@ export default defineEventHandler(async (event) => {
     if (path === "/favicon.ico") {
       return;
     }
-    const config = useRuntimeConfig();
+    const config = useRuntimeConfig(event);
     const $storefrontConfig = config.storefront;
     if (path === `${$storefrontConfig.apiBasePath ?? "/api"}/up`) {
       return;
     }
     const $shopConfig = getCurrentShopConfigForRequest(
       event,
-      $storefrontConfig
+      $storefrontConfig,
+      config
     );
     if (!$shopConfig) {
       event.context.$log.debug(
@@ -151,7 +152,11 @@ export default defineEventHandler(async (event) => {
       );
       return;
     }
-    const apiBasePath = getApiBasePath($storefrontConfig, $shopConfig);
+    const apiBasePath = getApiBasePath(
+      $storefrontConfig,
+      $shopConfig,
+      config.app.baseURL
+    );
     if (!event.context.$rpcContext) {
       event.context.$log.debug("Bootstrapping request: " + path);
       await bootstrap(

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

@@ -1,13 +1,14 @@
 import { type H3Event } from 'h3';
-import type { ModuleOptions, PublicShopConfig, ShopConfig, ShopConfigIndexed } from '../../../module';
+import type { ModuleBaseOptions, PublicShopConfig, ShopConfig, ShopConfigIndexed } from '../../../module';
+import type { NitroRuntimeConfig } from 'nitropack';
 type BootstrapPath = {
     path: string;
     originalPath: string;
 };
 export declare function getBootstrapPath(event: H3Event): BootstrapPath;
 export declare const convertShopsToList: (stores: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
-export declare function getApiBasePath(storefrontConfig: ModuleOptions, shop: ShopConfig): string;
-export declare function getCurrentShopConfigForRequest(event: H3Event, config: Pick<ModuleOptions, 'stores' | 'shopSelector'>): ShopConfig | undefined;
+export declare function getApiBasePath(storefrontConfig: ModuleBaseOptions, shop: ShopConfig, baseUrl: string): string;
+export declare function getCurrentShopConfigForRequest(event: H3Event, config: Pick<ModuleBaseOptions, 'stores' | 'shopSelector'>, runtimeConfig: NitroRuntimeConfig): ShopConfig | undefined;
 export declare function getPublicShopData(data: ShopConfig, currentShopId: number, apiBasePath: string, publicShopData?: (keyof ShopConfig)[]): PublicShopConfig & {
     isActive: boolean;
 };

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

@@ -3,6 +3,7 @@ import {
   getRequestHost,
   getRequestURL
 } from "h3";
+import { joinURL } from "ufo";
 export function getBootstrapPath(event) {
   const url = getRequestURL(event);
   const path = url.pathname === "/__nuxt_error" ? url.searchParams.get("url") ?? url.pathname : url.pathname;
@@ -12,15 +13,16 @@ const getShopByDomain = (event, shops) => {
   const host = getRequestHost(event, { xForwardedHost: true });
   return shops.find((s) => s.domain === host);
 };
-const getShopByPath = (event, shops) => {
+const getShopByPath = (event, shops, appBasePath) => {
   const { path } = getBootstrapPath(event);
-  const prefix = path.split("/")[1];
+  const localeIndex = appBasePath !== "/" ? 2 : 1;
+  const prefix = path.split("/")?.[localeIndex];
   return shops.find((shop) => prefix === shop.path);
 };
-const getShopByPathOrDefault = (event, shops) => {
+const getShopByPathOrDefault = (event, shops, appBasePath) => {
   const defaultShop = shops.find((shop) => shop.isDefault);
   const otherShops = shops.filter((shop) => !shop.isDefault);
-  return getShopByPath(event, otherShops) ?? defaultShop;
+  return getShopByPath(event, otherShops, appBasePath) ?? defaultShop;
 };
 export const convertShopsToList = (stores) => {
   if (Array.isArray(stores)) {
@@ -28,19 +30,21 @@ export const convertShopsToList = (stores) => {
   }
   return Object.values(stores);
 };
-export function getApiBasePath(storefrontConfig, shop) {
+export function getApiBasePath(storefrontConfig, shop, baseUrl) {
   const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
   if (storefrontConfig.shopSelector === "path") {
-    return `/${shop.path}${apiPath}`;
+    const pathElements = [shop.path, apiPath].filter(Boolean);
+    return joinURL(baseUrl, ...pathElements);
   } else if (storefrontConfig.shopSelector === "path_or_default") {
     if (shop.isDefault) {
-      return apiPath;
+      return joinURL(baseUrl, apiPath);
     }
-    return `/${shop.path}${apiPath}`;
+    const pathElements = [shop.path, apiPath].filter(Boolean);
+    return joinURL(baseUrl, ...pathElements);
   }
-  return apiPath;
+  return joinURL(baseUrl, apiPath);
 }
-export function getCurrentShopConfigForRequest(event, config) {
+export function getCurrentShopConfigForRequest(event, config, runtimeConfig) {
   let $shopConfig;
   const { shopSelector, stores } = config;
   const shopsList = convertShopsToList(stores);
@@ -51,9 +55,13 @@ export function getCurrentShopConfigForRequest(event, config) {
   } else if (shopSelector === "domain") {
     $shopConfig = getShopByDomain(event, shopsList);
   } else if (shopSelector === "path") {
-    $shopConfig = getShopByPath(event, shopsList);
+    $shopConfig = getShopByPath(event, shopsList, runtimeConfig.app.baseURL);
   } else if (shopSelector === "path_or_default") {
-    $shopConfig = getShopByPathOrDefault(event, shopsList);
+    $shopConfig = getShopByPathOrDefault(
+      event,
+      shopsList,
+      runtimeConfig.app.baseURL
+    );
   }
   return $shopConfig;
 }