@cimplify/sdk 0.108.0 → 0.110.2

package/dist/server/evict.mjs

@@ -1,11 +1,8 @@
-import '../chunk-3G6RQLXK.mjs';
+import '../chunk-25T4JHEA.mjs';
 import { computeCacheKey } from '@opennextjs/cloudflare/overrides/internal';
 import { getCloudflareContext } from '@opennextjs/cloudflare/cloudflare-context';
 
-var R2_BUCKET_BINDING = "NEXT_INC_CACHE_R2_BUCKET";
-var R2_PREFIX_ENV = "NEXT_INC_CACHE_R2_PREFIX";
-var PATH_INDEX_BINDING = "CIMPLIFY_PATH_INDEX";
-var CIMPLIFY_TAG_PREFIX = "cimplify:";
+var R2_BUCKET_BINDING = "NEXT_INC_CACHE_R2_BUCKET", R2_PREFIX_ENV = "NEXT_INC_CACHE_R2_PREFIX", PATH_INDEX_BINDING = "CIMPLIFY_PATH_INDEX", CIMPLIFY_TAG_PREFIX = "cimplify:";
 function r2Key(env, key, cacheType) {
   return computeCacheKey(key, {
     prefix: env[R2_PREFIX_ENV],
@@ -13,19 +10,27 @@ function r2Key(env, key, cacheType) {
     cacheType
   });
 }
-function cimplifyTags(value) {
-  return (value?.tags ?? []).filter((t) => t.startsWith(CIMPLIFY_TAG_PREFIX));
+var UNTAGGED_FETCH_TAG = `${CIMPLIFY_TAG_PREFIX}fetch`, NEXT_CACHE_TAGS_HEADER = "x-next-cache-tags";
+function tagList(raw) {
+  return Array.isArray(raw) ? raw.filter((tag) => typeof tag == "string") : typeof raw == "string" ? raw.split(",") : [];
+}
+function cimplifyTags(value, cacheType) {
+  let entry = typeof value == "object" && value !== null ? value : {}, found = /* @__PURE__ */ new Set();
+  for (let raw of [entry.tags, entry.meta?.headers?.[NEXT_CACHE_TAGS_HEADER], entry.data?.tags])
+    for (let tag of tagList(raw)) {
+      let trimmed = tag.trim();
+      trimmed.startsWith(CIMPLIFY_TAG_PREFIX) && found.add(trimmed);
+    }
+  return cacheType === "fetch" && found.add(UNTAGGED_FETCH_TAG), [...found];
 }
 function pathIndexFor(env) {
-  const ns = env[PATH_INDEX_BINDING];
-  const prefix = env[R2_PREFIX_ENV];
-  if (!ns || !prefix) return null;
-  return ns.get(ns.idFromName(prefix));
+  let ns = env[PATH_INDEX_BINDING], prefix = env[R2_PREFIX_ENV];
+  return !ns || !prefix ? null : ns.get(ns.idFromName(prefix));
 }
 function isAcceptedReservation(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const reservation = value;
-  return reservation.accepted === true && typeof reservation.generation === "number" && Number.isSafeInteger(reservation.generation) && reservation.generation >= 0;
+  if (typeof value != "object" || value === null) return false;
+  let reservation = value;
+  return reservation.accepted === true && typeof reservation.generation == "number" && Number.isSafeInteger(reservation.generation) && reservation.generation >= 0;
 }
 async function removeRejectedWrite(r2, key) {
   try {
@@ -37,38 +42,31 @@ async function removeRejectedWrite(r2, key) {
 var evictIncrementalCache = {
   name: "cimplify-evict-r2-cache",
   async get(key, cacheType) {
-    const env = getCloudflareContext().env;
-    const r2 = env[R2_BUCKET_BINDING];
+    let env = getCloudflareContext().env, r2 = env[R2_BUCKET_BINDING];
     if (!r2) return null;
     try {
-      const obj = await r2.get(r2Key(env, key, cacheType));
-      if (!obj) return null;
-      return {
+      let obj = await r2.get(r2Key(env, key, cacheType));
+      return obj ? {
         value: await obj.json(),
         lastModified: obj.uploaded.getTime()
-      };
+      } : null;
     } catch {
       return null;
     }
   },
   async set(key, value, cacheType) {
-    const env = getCloudflareContext().env;
-    const r2 = env[R2_BUCKET_BINDING];
+    let env = getCloudflareContext().env, r2 = env[R2_BUCKET_BINDING];
     if (!r2) return;
-    const k = r2Key(env, key, cacheType);
-    const tags = cimplifyTags(value);
-    let index = null;
-    let reservation = null;
+    let k = r2Key(env, key, cacheType), tags = cimplifyTags(value, cacheType), index = null, reservation = null;
     if (tags.length > 0) {
-      index = pathIndexFor(env);
-      if (!index) {
+      if (index = pathIndexFor(env), !index) {
         reportRejectedTaggedWrite("path-index-not-configured");
         return;
       }
       try {
-        const candidate = await index.indexAdd(key, k, tags, cacheType === "fetch");
+        let candidate = await index.indexAdd(key, k, tags, cacheType === "fetch");
         if (!isAcceptedReservation(candidate)) {
-          const fenceActive = typeof candidate === "object" && candidate !== null && candidate.accepted === false;
+          let fenceActive = typeof candidate == "object" && candidate !== null && candidate.accepted === !1;
           reportRejectedTaggedWrite(
             fenceActive ? "path-index-eviction-fence-active" : "path-index-invalid-reservation"
           );
@@ -96,13 +94,12 @@ var evictIncrementalCache = {
     }
   },
   async delete(key) {
-    const env = getCloudflareContext().env;
-    const r2 = env[R2_BUCKET_BINDING];
-    if (!r2) return;
-    try {
-      await r2.delete(r2Key(env, key));
-    } catch {
-    }
+    let env = getCloudflareContext().env, r2 = env[R2_BUCKET_BINDING];
+    if (r2)
+      try {
+        await r2.delete(r2Key(env, key));
+      } catch {
+      }
   }
 };
 function reportRejectedTaggedWrite(reason) {

package/dist/server/tanstack.d.mts

@@ -3,12 +3,15 @@ import { R2Bucket, DurableObjectNamespace } from '@cloudflare/workers-types';
 /**
  * `@cimplify/sdk/server/tanstack` - TanStack Start/Nitro cache support.
  *
- * The deployment adapter binds:
+ * Cimplify deployments hand each request a site-cache capability in
+ * `ctx.props.CIMPLIFY_CACHE` (pass it with `getSiteCache`). The dispatch worker
+ * behind it confines every key to the site's own prefix and runs the PathIndex
+ * reservation itself. Older deployments bound the raw resources instead:
  *   - CIMPLIFY_CACHE_R2_BUCKET
  *   - CIMPLIFY_CACHE_R2_PREFIX
  *   - CIMPLIFY_PATH_INDEX
  *
- * This driver consumes those bindings and mirrors the Next/OpenNext eviction
+ * Either way the driver mirrors the Next/OpenNext eviction
  * contract: reserve cimplify:* tags in PathIndex, write to R2, then confirm
  * that no eviction crossed the write. Tagged values fail closed when indexing
  * is unavailable or their reservation is invalidated, so the central eviction
@@ -44,7 +47,48 @@ interface CimplifyTanstackCacheSetOptions {
     [CIMPLIFY_CACHE_META_FIELD]?: CimplifyCacheIndexMetadata;
     [key: string]: unknown;
 }
+declare const SITE_CACHE_PROP = "CIMPLIFY_CACHE";
+/**
+ * `Symbol.for` key of the AsyncLocalStorage the platform's worker entry runs
+ * each request in, holding that request's site-cache capability. It lets the
+ * driver find the cache when the project passes no `getSiteCache`.
+ */
+declare const SITE_CACHE_CONTEXT_KEY = "cimplify.site-cache.context";
+interface CimplifySiteCacheIndex {
+    cacheKey: string;
+    tags: readonly string[];
+    isFetch: boolean;
+}
+interface CimplifySiteCacheListPage {
+    keys: string[];
+    cursor: string | null;
+}
+type CimplifySiteCacheBody = string | ArrayBuffer | ArrayBufferView;
+/**
+ * The per-request cache capability the Cimplify dispatch worker passes every
+ * storefront in `ctx.props.CIMPLIFY_CACHE`. Keys are relative to the site;
+ * the dispatch worker confines them to the site's own prefix.
+ */
+interface CimplifySiteCache {
+    get(key: string): Promise<{
+        body: string;
+        uploaded: number;
+    } | null>;
+    head(key: string): Promise<boolean>;
+    put(key: string, body: CimplifySiteCacheBody, index?: CimplifySiteCacheIndex): Promise<string>;
+    delete(key: string): Promise<void>;
+    list(base?: string, cursor?: string | null): Promise<CimplifySiteCacheListPage>;
+}
+/** Reads the site-cache capability from a Worker's `ctx.props`. */
+declare function cimplifySiteCacheFromProps(props: unknown): CimplifySiteCache | undefined;
 interface CimplifyTanstackCacheDriverOptions {
+    /**
+     * Returns this request's site-cache capability, for example
+     * `() => cimplifySiteCacheFromProps(event.context.cloudflare.context.props)`.
+     * Preferred over raw bindings, which new Cimplify deployments no longer
+     * receive.
+     */
+    getSiteCache?: () => Awaitable<CimplifySiteCache | null | undefined>;
     env?: CimplifyTanstackCacheEnv;
     getEnv?: () => Awaitable<CimplifyTanstackCacheEnv | undefined>;
     prefix?: string;
@@ -66,6 +110,8 @@ interface CimplifyTanstackCacheDriver {
     clear(base?: string): Promise<void>;
 }
 declare function cimplifyTanstackR2Key(prefix: string, key: string, namespace?: string): string;
+/** The request's capability, published by the platform's worker entry. */
+declare function ambientSiteCache(): CimplifySiteCache | undefined;
 declare function cimplifyTanstackCacheOptions(metadata: CimplifyCacheIndexMetadata): CimplifyTanstackCacheSetOptions;
 declare function withCimplifyCacheMetadata<T extends Record<string, unknown>>(value: T, metadata: CimplifyCacheIndexMetadata): T & {
     [CIMPLIFY_CACHE_META_FIELD]: CimplifyCacheIndexMetadata;
@@ -73,4 +119,4 @@ declare function withCimplifyCacheMetadata<T extends Record<string, unknown>>(va
 declare function createCimplifyTanstackCacheDriver(options?: CimplifyTanstackCacheDriverOptions): CimplifyTanstackCacheDriver;
 declare const cimplifyTanstackCacheDriver: typeof createCimplifyTanstackCacheDriver;
 
-export { CIMPLIFY_CACHE_META_FIELD, CIMPLIFY_TAG_PREFIX, type CimplifyCacheIndexMetadata, type CimplifyTanstackCacheDriver, type CimplifyTanstackCacheDriverOptions, type CimplifyTanstackCacheEnv, type CimplifyTanstackCacheSetOptions, TANSTACK_CACHE_NAMESPACE, TANSTACK_PATH_INDEX_BINDING, TANSTACK_R2_BUCKET_BINDING, TANSTACK_R2_PREFIX_ENV, cimplifyTanstackCacheDriver, cimplifyTanstackCacheOptions, cimplifyTanstackR2Key, createCimplifyTanstackCacheDriver, withCimplifyCacheMetadata };
+export { CIMPLIFY_CACHE_META_FIELD, CIMPLIFY_TAG_PREFIX, type CimplifyCacheIndexMetadata, type CimplifySiteCache, type CimplifySiteCacheBody, type CimplifySiteCacheIndex, type CimplifySiteCacheListPage, type CimplifyTanstackCacheDriver, type CimplifyTanstackCacheDriverOptions, type CimplifyTanstackCacheEnv, type CimplifyTanstackCacheSetOptions, SITE_CACHE_CONTEXT_KEY, SITE_CACHE_PROP, TANSTACK_CACHE_NAMESPACE, TANSTACK_PATH_INDEX_BINDING, TANSTACK_R2_BUCKET_BINDING, TANSTACK_R2_PREFIX_ENV, ambientSiteCache, cimplifySiteCacheFromProps, cimplifyTanstackCacheDriver, cimplifyTanstackCacheOptions, cimplifyTanstackR2Key, createCimplifyTanstackCacheDriver, withCimplifyCacheMetadata };

package/dist/server/tanstack.d.ts

@@ -3,12 +3,15 @@ import { R2Bucket, DurableObjectNamespace } from '@cloudflare/workers-types';
 /**
  * `@cimplify/sdk/server/tanstack` - TanStack Start/Nitro cache support.
  *
- * The deployment adapter binds:
+ * Cimplify deployments hand each request a site-cache capability in
+ * `ctx.props.CIMPLIFY_CACHE` (pass it with `getSiteCache`). The dispatch worker
+ * behind it confines every key to the site's own prefix and runs the PathIndex
+ * reservation itself. Older deployments bound the raw resources instead:
  *   - CIMPLIFY_CACHE_R2_BUCKET
  *   - CIMPLIFY_CACHE_R2_PREFIX
  *   - CIMPLIFY_PATH_INDEX
  *
- * This driver consumes those bindings and mirrors the Next/OpenNext eviction
+ * Either way the driver mirrors the Next/OpenNext eviction
  * contract: reserve cimplify:* tags in PathIndex, write to R2, then confirm
  * that no eviction crossed the write. Tagged values fail closed when indexing
  * is unavailable or their reservation is invalidated, so the central eviction
@@ -44,7 +47,48 @@ interface CimplifyTanstackCacheSetOptions {
     [CIMPLIFY_CACHE_META_FIELD]?: CimplifyCacheIndexMetadata;
     [key: string]: unknown;
 }
+declare const SITE_CACHE_PROP = "CIMPLIFY_CACHE";
+/**
+ * `Symbol.for` key of the AsyncLocalStorage the platform's worker entry runs
+ * each request in, holding that request's site-cache capability. It lets the
+ * driver find the cache when the project passes no `getSiteCache`.
+ */
+declare const SITE_CACHE_CONTEXT_KEY = "cimplify.site-cache.context";
+interface CimplifySiteCacheIndex {
+    cacheKey: string;
+    tags: readonly string[];
+    isFetch: boolean;
+}
+interface CimplifySiteCacheListPage {
+    keys: string[];
+    cursor: string | null;
+}
+type CimplifySiteCacheBody = string | ArrayBuffer | ArrayBufferView;
+/**
+ * The per-request cache capability the Cimplify dispatch worker passes every
+ * storefront in `ctx.props.CIMPLIFY_CACHE`. Keys are relative to the site;
+ * the dispatch worker confines them to the site's own prefix.
+ */
+interface CimplifySiteCache {
+    get(key: string): Promise<{
+        body: string;
+        uploaded: number;
+    } | null>;
+    head(key: string): Promise<boolean>;
+    put(key: string, body: CimplifySiteCacheBody, index?: CimplifySiteCacheIndex): Promise<string>;
+    delete(key: string): Promise<void>;
+    list(base?: string, cursor?: string | null): Promise<CimplifySiteCacheListPage>;
+}
+/** Reads the site-cache capability from a Worker's `ctx.props`. */
+declare function cimplifySiteCacheFromProps(props: unknown): CimplifySiteCache | undefined;
 interface CimplifyTanstackCacheDriverOptions {
+    /**
+     * Returns this request's site-cache capability, for example
+     * `() => cimplifySiteCacheFromProps(event.context.cloudflare.context.props)`.
+     * Preferred over raw bindings, which new Cimplify deployments no longer
+     * receive.
+     */
+    getSiteCache?: () => Awaitable<CimplifySiteCache | null | undefined>;
     env?: CimplifyTanstackCacheEnv;
     getEnv?: () => Awaitable<CimplifyTanstackCacheEnv | undefined>;
     prefix?: string;
@@ -66,6 +110,8 @@ interface CimplifyTanstackCacheDriver {
     clear(base?: string): Promise<void>;
 }
 declare function cimplifyTanstackR2Key(prefix: string, key: string, namespace?: string): string;
+/** The request's capability, published by the platform's worker entry. */
+declare function ambientSiteCache(): CimplifySiteCache | undefined;
 declare function cimplifyTanstackCacheOptions(metadata: CimplifyCacheIndexMetadata): CimplifyTanstackCacheSetOptions;
 declare function withCimplifyCacheMetadata<T extends Record<string, unknown>>(value: T, metadata: CimplifyCacheIndexMetadata): T & {
     [CIMPLIFY_CACHE_META_FIELD]: CimplifyCacheIndexMetadata;
@@ -73,4 +119,4 @@ declare function withCimplifyCacheMetadata<T extends Record<string, unknown>>(va
 declare function createCimplifyTanstackCacheDriver(options?: CimplifyTanstackCacheDriverOptions): CimplifyTanstackCacheDriver;
 declare const cimplifyTanstackCacheDriver: typeof createCimplifyTanstackCacheDriver;
 
-export { CIMPLIFY_CACHE_META_FIELD, CIMPLIFY_TAG_PREFIX, type CimplifyCacheIndexMetadata, type CimplifyTanstackCacheDriver, type CimplifyTanstackCacheDriverOptions, type CimplifyTanstackCacheEnv, type CimplifyTanstackCacheSetOptions, TANSTACK_CACHE_NAMESPACE, TANSTACK_PATH_INDEX_BINDING, TANSTACK_R2_BUCKET_BINDING, TANSTACK_R2_PREFIX_ENV, cimplifyTanstackCacheDriver, cimplifyTanstackCacheOptions, cimplifyTanstackR2Key, createCimplifyTanstackCacheDriver, withCimplifyCacheMetadata };
+export { CIMPLIFY_CACHE_META_FIELD, CIMPLIFY_TAG_PREFIX, type CimplifyCacheIndexMetadata, type CimplifySiteCache, type CimplifySiteCacheBody, type CimplifySiteCacheIndex, type CimplifySiteCacheListPage, type CimplifyTanstackCacheDriver, type CimplifyTanstackCacheDriverOptions, type CimplifyTanstackCacheEnv, type CimplifyTanstackCacheSetOptions, SITE_CACHE_CONTEXT_KEY, SITE_CACHE_PROP, TANSTACK_CACHE_NAMESPACE, TANSTACK_PATH_INDEX_BINDING, TANSTACK_R2_BUCKET_BINDING, TANSTACK_R2_PREFIX_ENV, ambientSiteCache, cimplifySiteCacheFromProps, cimplifyTanstackCacheDriver, cimplifyTanstackCacheOptions, cimplifyTanstackR2Key, createCimplifyTanstackCacheDriver, withCimplifyCacheMetadata };