@doswiftly/storefront-sdk 22.8.0 → 22.9.0

package/dist/core/image.d.ts

@@ -50,6 +50,15 @@ export interface ImageLoaderConfig {
      * framework already fingerprints). Defaults to {@link FRAMEWORK_BUILD_PREFIXES}.
      */
     buildAssetPrefixes?: readonly string[];
+    /**
+     * Build clean asset URLs without the `/s/{shopId}` storage namespace. Set for a storefront served
+     * from a custom domain (`{cdnBase}/_next/static/media/…`), where the platform restores the namespace
+     * toward storage at the edge so the stored object key is unchanged. Defaults to `false` — the
+     * platform CDN keeps the namespace in the URL (`{cdnBase}/s/{shopId}/…`). The deploy pipeline sets
+     * this from the same provisioning signal that picks the asset host, so the URL form and the storage
+     * key can never disagree.
+     */
+    cleanUrl?: boolean;
 }
 /**
  * Framework build-output path prefixes — hashed/immutable assets the framework already

package/dist/core/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/core/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe;IACf,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,2GAA2G;IAC3G,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAMD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,6BAA6B,CAAC;AAE7D,6EAA6E;AAC7E,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;IACf,2GAA2G;IAC3G,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,uDAAwD,CAAC;AA2C9F,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC,MAAM,CAwDR;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAiD5F"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/core/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe;IACf,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,2GAA2G;IAC3G,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAMD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,6BAA6B,CAAC;AAE7D,6EAA6E;AAC7E,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;IACf,2GAA2G;IAC3G,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,uDAAwD,CAAC;AAyF9F,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC,MAAM,CAqER;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAiD5F"}

package/dist/core/image.js

@@ -69,10 +69,58 @@ const NEXT_STATIC_MEDIA_PREFIX = '/_next/static/media/';
 function nextStaticMediaSuffix(pathname) {
     return pathname.startsWith(NEXT_STATIC_MEDIA_PREFIX) ? pathname.slice(NEXT_STATIC_MEDIA_PREFIX.length) : null;
 }
+/** Scheme + authority of an absolute http(s) URL — everything up to the first path `/`. */
+const ABSOLUTE_URL_AUTHORITY = /^https?:\/\/[^/]+/i;
+/**
+ * Suffix after the media segment when `src` is an ABSOLUTE URL — a code-imported image whose `src`
+ * carries the storefront's Next.js `assetPrefix` (which Next prepends before the loader runs). The
+ * anchor is the storage namespace `ns` (`/s/{shopId}` by default, empty when `cleanUrl`):
+ *  - default: `{assetPrefixBase}/s/{shopId}/_next/static/media/{suffix}` (`ns` = `/s/{shopId}`);
+ *  - clean: `{assetPrefixBase}/_next/static/media/{suffix}` (`ns` = ``).
+ * Anchored on the EXACT `${ns}/_next/static/media/`, so a foreign host that merely embeds the marker
+ * mid-path is rejected. `null` for relative srcs, other namespaces, and foreign hosts. Matched on
+ * path structure, not host — the asset-prefix host is not part of the loader config, only the resize
+ * base is.
+ *
+ * The path is taken from the RAW `src` (strip scheme/authority + query/hash), NOT via `URL.pathname`:
+ * that percent-encodes the path, which would double-encode in {@link buildNextMediaCdnUrl}. The
+ * root-relative counterpart {@link nextStaticMediaSuffix} likewise feeds a raw path, so both `src`
+ * forms of one import — relative (no `assetPrefix`) and absolute (with it) — encode identically.
+ */
+function absoluteNextMediaSuffix(src, ns) {
+    // Fast reject before any allocation: must be an absolute http(s) URL that mentions the media segment.
+    if (!ABSOLUTE_URL_AUTHORITY.test(src) || !src.includes(NEXT_STATIC_MEDIA_PREFIX))
+        return null;
+    const path = src.replace(ABSOLUTE_URL_AUTHORITY, '').replace(/[?#].*$/, '');
+    const prefix = `${ns}${NEXT_STATIC_MEDIA_PREFIX}`;
+    return path.startsWith(prefix) ? path.slice(prefix.length) : null;
+}
+/**
+ * Image-CDN URL for a Next build-output media image (content-hashed → the hash IS the version, so the
+ * key is immutable: only the per-srcset `width`, no `?v=`). The same key shape the deploy mirror
+ * writes, so the resize CDN finds the file. Shared by both `src` forms of one import: root-relative
+ * ({@link nextStaticMediaSuffix}) and absolute `assetPrefix` ({@link absoluteNextMediaSuffix}).
+ *
+ * `encodeURIComponent` keeps `..` (unreserved) — harmless while the image CDN is unsigned + public;
+ * if HMAC signing is ever added, strip `..` segments here AND in the public/ branch.
+ *
+ * `ns` is the storage namespace (empty for a custom domain, `/s/{shopId}` for the platform CDN); the
+ * platform restores it toward storage for a custom domain, so the stored object key is the same.
+ *
+ * @sync-with backend deploy mirror (`_next/static/media/` mirrored 1:1 into the image-CDN key)
+ */
+function buildNextMediaCdnUrl(base, ns, suffix, width) {
+    const encoded = suffix.split('/').map(encodeURIComponent).join('/');
+    return `${base}${ns}/_next/static/media/${encoded}?width=${width}`;
+}
 export function buildImageLoaderUrl(config, args) {
     // `||` (not `??`): an empty injected base must still fall back to the platform default.
     const base = (config.cdnBase || IMAGE_CDN_BASE_URL).replace(/\/+$/, '');
     const { src, width } = args;
+    // Storage namespace prepended to local-asset URLs: empty when clean (a custom domain restores it
+    // toward storage), `/s/{shopId}` otherwise. Computed once, threaded through both URL builders and
+    // the absolute-media anchor so the form is decided in one place.
+    const ns = (config.cleanUrl ?? false) ? '' : `/s/${config.shopId}`;
     // (1) Product image — already an absolute CDN URL. Set the per-srcset width.
     if (src.startsWith(base)) {
         try {
@@ -84,6 +132,18 @@ export function buildImageLoaderUrl(config, args) {
             return src;
         }
     }
+    // (1b) Absolute build-output media URL — a code-imported image whose `src` carries the storefront's
+    //      next.config `assetPrefix` (`{base}/s/{shopId}/_next/static/media/...`, prepended by Next
+    //      before this loader). Routed to the SAME image-CDN key as the root-relative case (2a) — the two
+    //      are just the assetPrefix / no-assetPrefix forms of one import. Fonts (`.woff2`) share
+    //      `_next/static/media/` but are not images, so the extension gate leaves them to load raw from
+    //      the asset CDN (they are not mirrored to the resize CDN).
+    if (config.shopId) {
+        const mediaSuffix = absoluteNextMediaSuffix(src, ns);
+        if (mediaSuffix !== null && LOADER_IMAGE_EXTENSIONS.test(mediaSuffix)) {
+            return buildNextMediaCdnUrl(base, ns, mediaSuffix, width);
+        }
+    }
     // (2) Local root-relative image — NOT protocol-relative (`//host`). Two sub-cases:
     //     (2a) a Next build-output media image (`/_next/static/media/*`), and (2b) a `public/` image.
     if (src.startsWith('/') && !src.startsWith('//')) {
@@ -96,14 +156,10 @@ export function buildImageLoaderUrl(config, args) {
         // extension gate is the safety that keeps framework build chunks out of the resize CDN.
         if (!LOADER_IMAGE_EXTENSIONS.test(pathname))
             return src;
-        // (2a) Next build-output media image. The content hash in the filename IS the version, so
-        // the CDN key is immutable → no `?v=`. The deploy mirrors these to `s/{shopId}/_next/static/media/`.
+        // (2a) Next build-output media image — same image-CDN key as the absolute (assetPrefix) form (1b).
         const mediaSuffix = nextStaticMediaSuffix(pathname);
         if (mediaSuffix !== null) {
-            // `encodeURIComponent` keeps `..` (unreserved) — harmless while the image CDN is unsigned +
-            // public; if HMAC signing is ever added, strip `..` segments here AND in the public/ branch.
-            const encoded = mediaSuffix.split('/').map(encodeURIComponent).join('/');
-            return `${base}/s/${config.shopId}/_next/static/media/${encoded}?width=${width}`;
+            return buildNextMediaCdnUrl(base, ns, mediaSuffix, width);
         }
         // Any other framework build output (hashed/immutable, NOT mirrored) → untouched.
         const buildPrefixes = config.buildAssetPrefixes ?? FRAMEWORK_BUILD_PREFIXES;
@@ -120,7 +176,7 @@ export function buildImageLoaderUrl(config, args) {
             .split('/')
             .map(encodeURIComponent)
             .join('/');
-        return `${base}/s/${config.shopId}/public/${path}?width=${width}&v=${config.version}`;
+        return `${base}${ns}/public/${path}?width=${width}&v=${config.version}`;
     }
     // (3) Build assets, protocol-relative/external URLs, data URIs — untouched.
     return src;

package/dist/core/operations/cart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cart.d.ts","sourceRoot":"","sources":["../../../src/core/operations/cart.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAkcH,eAAO,MAAM,UAAU,QAOrB,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,qCAAqC,QAehD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,QAO1C,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAO/B,CAAC;AAMH,eAAO,MAAM,WAAW,QAYtB,CAAC;AAEH,eAAO,MAAM,cAAc,QAWzB,CAAC;AAEH,eAAO,MAAM,iBAAiB,QAW5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,QAW5B,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAEH,eAAO,MAAM,gBAAgB,QAW3B,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,QAWjC,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAMH;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,QAWrB,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,QAWnC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,QAY/B,CAAC;AAMH,eAAO,MAAM,yBAAyB,QAWpC,CAAC;AAEH,eAAO,MAAM,wBAAwB,QAWnC,CAAC;AAEH,eAAO,MAAM,2BAA2B,QAWtC,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAEH,eAAO,MAAM,oBAAoB,QAW/B,CAAC;AAEH,eAAO,MAAM,qBAAqB,QAWhC,CAAC;AAEH,eAAO,MAAM,+BAA+B,QAW1C,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,QAWxB,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,cAAc,QAWzB,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,QAWvC,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,QAoBtC,CAAC"}
+{"version":3,"file":"cart.d.ts","sourceRoot":"","sources":["../../../src/core/operations/cart.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAmcH,eAAO,MAAM,UAAU,QAOrB,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,qCAAqC,QAehD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,QAO1C,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAO/B,CAAC;AAMH,eAAO,MAAM,WAAW,QAYtB,CAAC;AAEH,eAAO,MAAM,cAAc,QAWzB,CAAC;AAEH,eAAO,MAAM,iBAAiB,QAW5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,QAW5B,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAEH,eAAO,MAAM,gBAAgB,QAW3B,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,QAWjC,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAMH;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,QAWrB,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,QAWnC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,QAY/B,CAAC;AAMH,eAAO,MAAM,yBAAyB,QAWpC,CAAC;AAEH,eAAO,MAAM,wBAAwB,QAWnC,CAAC;AAEH,eAAO,MAAM,2BAA2B,QAWtC,CAAC;AAEH,eAAO,MAAM,0BAA0B,QAWrC,CAAC;AAEH,eAAO,MAAM,oBAAoB,QAW/B,CAAC;AAEH,eAAO,MAAM,qBAAqB,QAWhC,CAAC;AAEH,eAAO,MAAM,+BAA+B,QAW1C,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,QAWxB,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,cAAc,QAWzB,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,QAWvC,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,QAoBtC,CAAC"}

package/dist/core/operations/cart.js

@@ -277,6 +277,7 @@ const ORDER_FRAGMENT = `
     expiredAt
     shippingAddress { ...MailingAddress }
     itemCount
+    customerNote
     discountAllocations {
       discountCode
       amount { ...Money }

package/dist/next/image-loader.d.ts

@@ -12,10 +12,10 @@
  * export default createImageLoader();
  * ```
  *
- * Zero configuration: the shop identifier, deployment version, and image-CDN base URL are
- * read from the public environment variables the DoSwiftly deploy pipeline injects
- * (`NEXT_PUBLIC_SHOP_ID`, `NEXT_PUBLIC_DEPLOYMENT_COMMIT`, `NEXT_PUBLIC_IMGPROXY_BASE`).
- * Pass overrides only for tests or non-standard hosting.
+ * Zero configuration: the shop identifier, deployment version, image-CDN base URL, and clean-URL
+ * flag are read from the public environment variables the DoSwiftly deploy pipeline injects
+ * (`NEXT_PUBLIC_SHOP_ID`, `NEXT_PUBLIC_DEPLOYMENT_COMMIT`, `NEXT_PUBLIC_IMGPROXY_BASE`,
+ * `NEXT_PUBLIC_ASSET_CLEAN_URL`). Pass overrides only for tests or non-standard hosting.
  *
  * This entry is Next-specific (it reads `NEXT_PUBLIC_*`); the framework-agnostic core (`.`)
  * stays free of it.

package/dist/next/image-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-loader.d.ts","sourceRoot":"","sources":["../../src/next/image-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE5E,yDAAyD;AACzD,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAClC,CAAC,IAAI,EAAE,mBAAmB,KAAK,MAAM,CAevC"}
+{"version":3,"file":"image-loader.d.ts","sourceRoot":"","sources":["../../src/next/image-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE5E,yDAAyD;AACzD,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAClC,CAAC,IAAI,EAAE,mBAAmB,KAAK,MAAM,CAgBvC"}

package/dist/next/image-loader.js

@@ -12,10 +12,10 @@
  * export default createImageLoader();
  * ```
  *
- * Zero configuration: the shop identifier, deployment version, and image-CDN base URL are
- * read from the public environment variables the DoSwiftly deploy pipeline injects
- * (`NEXT_PUBLIC_SHOP_ID`, `NEXT_PUBLIC_DEPLOYMENT_COMMIT`, `NEXT_PUBLIC_IMGPROXY_BASE`).
- * Pass overrides only for tests or non-standard hosting.
+ * Zero configuration: the shop identifier, deployment version, image-CDN base URL, and clean-URL
+ * flag are read from the public environment variables the DoSwiftly deploy pipeline injects
+ * (`NEXT_PUBLIC_SHOP_ID`, `NEXT_PUBLIC_DEPLOYMENT_COMMIT`, `NEXT_PUBLIC_IMGPROXY_BASE`,
+ * `NEXT_PUBLIC_ASSET_CLEAN_URL`). Pass overrides only for tests or non-standard hosting.
  *
  * This entry is Next-specific (it reads `NEXT_PUBLIC_*`); the framework-agnostic core (`.`)
  * stays free of it.
@@ -39,6 +39,7 @@ export function createImageLoader(config) {
         shopId: config?.shopId ?? process.env.NEXT_PUBLIC_SHOP_ID ?? '',
         version: config?.version ?? process.env.NEXT_PUBLIC_DEPLOYMENT_COMMIT ?? '',
         cdnBase: config?.cdnBase ?? process.env.NEXT_PUBLIC_IMGPROXY_BASE,
+        cleanUrl: config?.cleanUrl ?? (process.env.NEXT_PUBLIC_ASSET_CLEAN_URL === 'true'),
     };
     // Dev-only hint: surface raster images that the loader can't optimize (an external host, or
     // a build asset outside `/_next/static/media/`). Only when a shopId is resolved — without one

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doswiftly/storefront-sdk",
-  "version": "22.8.0",
+  "version": "22.9.0",
   "description": "Storefront runtime SDK for DoSwiftly Commerce — layered transport, middleware pipeline, React providers, Zustand stores, cache strategies. 0 runtime dependencies in core.",
   "type": "module",
   "sideEffects": false,