@netlify/cache 1.8.2 → 1.9.0

package/dist/bootstrap/main.cjs

@@ -3,6 +3,9 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,24 +19,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // src/bootstrap/main.ts
 var main_exports = {};
@@ -52,6 +41,9 @@ var Operation = /* @__PURE__ */ ((Operation2) => {
   return Operation2;
 })(Operation || {});
 
+// src/bootstrap/cache.ts
+var import_runtime_utils = require("@netlify/runtime-utils");
+
 // src/bootstrap/errors.ts
 var ERROR_CODES = {
   invalid_vary: "Responses must not use unsupported directives of the `Netlify-Vary` header (https://ntl.fyi/cache_api_invalid_vary).",
@@ -78,14 +70,12 @@ var allowedProtocols = /* @__PURE__ */ new Set(["http:", "https:"]);
 var discardedHeaders = /* @__PURE__ */ new Set(["cookie", "content-encoding", "content-length"]);
 var getInternalHeaders = Symbol("getInternalHeaders");
 var serializeResourceHeaders = Symbol("serializeResourceHeaders");
-var _base64Encode, _getContext, _name, _userAgent;
+var _getContext, _name, _userAgent;
 var NetlifyCache = class {
-  constructor({ base64Encode, getContext, name, userAgent }) {
-    __privateAdd(this, _base64Encode, void 0);
-    __privateAdd(this, _getContext, void 0);
-    __privateAdd(this, _name, void 0);
-    __privateAdd(this, _userAgent, void 0);
-    __privateSet(this, _base64Encode, base64Encode);
+  constructor({ getContext, name, userAgent }) {
+    __privateAdd(this, _getContext);
+    __privateAdd(this, _name);
+    __privateAdd(this, _userAgent);
     __privateSet(this, _getContext, getContext);
     __privateSet(this, _name, name);
     __privateSet(this, _userAgent, userAgent);
@@ -117,7 +107,7 @@ var NetlifyCache = class {
         headersMap[key] = value.split(",");
       }
     });
-    return __privateGet(this, _base64Encode).call(this, JSON.stringify(headersMap));
+    return (0, import_runtime_utils.base64Encode)(JSON.stringify(headersMap));
   }
   async add(request) {
     await this.put(new Request(request), await fetch(request));
@@ -198,13 +188,12 @@ var NetlifyCache = class {
       method: "POST"
     });
     if (!cacheResponse.ok) {
-      const errorDetail = cacheResponse.headers.get(ErrorDetail) ?? "";
+      const errorDetail = cacheResponse.headers?.get(ErrorDetail) ?? "";
       const errorMessage = ERROR_CODES[errorDetail] || GENERIC_ERROR;
       context.logger?.(`Failed to write to the cache: ${errorMessage}`);
     }
   }
 };
-_base64Encode = new WeakMap();
 _getContext = new WeakMap();
 _name = new WeakMap();
 _userAgent = new WeakMap();
@@ -234,8 +223,8 @@ var toCacheKey = (url) => encodeURIComponent(url.toString());
 var _environmentOptions, _stores;
 var NetlifyCacheStorage = class {
   constructor(environmentOptions) {
-    __privateAdd(this, _environmentOptions, void 0);
-    __privateAdd(this, _stores, void 0);
+    __privateAdd(this, _environmentOptions);
+    __privateAdd(this, _stores);
     __privateSet(this, _environmentOptions, environmentOptions);
     __privateSet(this, _stores, /* @__PURE__ */ new Map());
   }

package/dist/bootstrap/main.d.cts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions } from '../cache-7af07baa.js';
-export { B as Base64Encoder, N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-7af07baa.js';
+import { E as EnvironmentOptions } from '../cache-BHHI9pin.cjs';
+export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-BHHI9pin.cjs';
 
 declare class NetlifyCacheStorage {
     #private;

package/dist/bootstrap/main.d.ts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions } from '../cache-7af07baa.js';
-export { B as Base64Encoder, N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-7af07baa.js';
+import { E as EnvironmentOptions } from '../cache-BHHI9pin.js';
+export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-BHHI9pin.js';
 
 declare class NetlifyCacheStorage {
     #private;

package/dist/bootstrap/main.js

@@ -1,21 +1,10 @@
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
+var __typeError = (msg) => {
+  throw TypeError(msg);
 };
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // src/bootstrap/environment.ts
 var Operation = /* @__PURE__ */ ((Operation2) => {
@@ -25,6 +14,9 @@ var Operation = /* @__PURE__ */ ((Operation2) => {
   return Operation2;
 })(Operation || {});
 
+// src/bootstrap/cache.ts
+import { base64Encode } from "@netlify/runtime-utils";
+
 // src/bootstrap/errors.ts
 var ERROR_CODES = {
   invalid_vary: "Responses must not use unsupported directives of the `Netlify-Vary` header (https://ntl.fyi/cache_api_invalid_vary).",
@@ -51,14 +43,12 @@ var allowedProtocols = /* @__PURE__ */ new Set(["http:", "https:"]);
 var discardedHeaders = /* @__PURE__ */ new Set(["cookie", "content-encoding", "content-length"]);
 var getInternalHeaders = Symbol("getInternalHeaders");
 var serializeResourceHeaders = Symbol("serializeResourceHeaders");
-var _base64Encode, _getContext, _name, _userAgent;
+var _getContext, _name, _userAgent;
 var NetlifyCache = class {
-  constructor({ base64Encode, getContext, name, userAgent }) {
-    __privateAdd(this, _base64Encode, void 0);
-    __privateAdd(this, _getContext, void 0);
-    __privateAdd(this, _name, void 0);
-    __privateAdd(this, _userAgent, void 0);
-    __privateSet(this, _base64Encode, base64Encode);
+  constructor({ getContext, name, userAgent }) {
+    __privateAdd(this, _getContext);
+    __privateAdd(this, _name);
+    __privateAdd(this, _userAgent);
     __privateSet(this, _getContext, getContext);
     __privateSet(this, _name, name);
     __privateSet(this, _userAgent, userAgent);
@@ -90,7 +80,7 @@ var NetlifyCache = class {
         headersMap[key] = value.split(",");
       }
     });
-    return __privateGet(this, _base64Encode).call(this, JSON.stringify(headersMap));
+    return base64Encode(JSON.stringify(headersMap));
   }
   async add(request) {
     await this.put(new Request(request), await fetch(request));
@@ -171,13 +161,12 @@ var NetlifyCache = class {
       method: "POST"
     });
     if (!cacheResponse.ok) {
-      const errorDetail = cacheResponse.headers.get(ErrorDetail) ?? "";
+      const errorDetail = cacheResponse.headers?.get(ErrorDetail) ?? "";
       const errorMessage = ERROR_CODES[errorDetail] || GENERIC_ERROR;
       context.logger?.(`Failed to write to the cache: ${errorMessage}`);
     }
   }
 };
-_base64Encode = new WeakMap();
 _getContext = new WeakMap();
 _name = new WeakMap();
 _userAgent = new WeakMap();
@@ -207,8 +196,8 @@ var toCacheKey = (url) => encodeURIComponent(url.toString());
 var _environmentOptions, _stores;
 var NetlifyCacheStorage = class {
   constructor(environmentOptions) {
-    __privateAdd(this, _environmentOptions, void 0);
-    __privateAdd(this, _stores, void 0);
+    __privateAdd(this, _environmentOptions);
+    __privateAdd(this, _stores);
     __privateSet(this, _environmentOptions, environmentOptions);
     __privateSet(this, _stores, /* @__PURE__ */ new Map());
   }

package/dist/{cache-7af07baa.d.ts → cache-BHHI9pin.d.cts}

@@ -1,7 +1,5 @@
-type Base64Encoder = (input: string) => string;
 type Logger = (...args: any[]) => void;
 interface EnvironmentOptions {
-    base64Encode: Base64Encoder;
     getContext: RequestContextFactory;
     userAgent?: string;
 }
@@ -27,7 +25,7 @@ declare const getInternalHeaders: unique symbol;
 declare const serializeResourceHeaders: unique symbol;
 declare class NetlifyCache implements Cache {
     #private;
-    constructor({ base64Encode, getContext, name, userAgent }: NetlifyCacheOptions);
+    constructor({ getContext, name, userAgent }: NetlifyCacheOptions);
     private [getInternalHeaders];
     private [serializeResourceHeaders];
     add(request: RequestInfo): Promise<void>;
@@ -39,4 +37,4 @@ declare class NetlifyCache implements Cache {
     put(request: RequestInfo | URL | string, response: Response): Promise<void>;
 }
 
-export { Base64Encoder as B, EnvironmentOptions as E, NetlifyCache as N, Operation as O, RequestContextFactory as R };
+export { type EnvironmentOptions as E, NetlifyCache as N, Operation as O, type RequestContextFactory as R };

package/dist/cache-BHHI9pin.d.ts

@@ -0,0 +1,40 @@
+type Logger = (...args: any[]) => void;
+interface EnvironmentOptions {
+    getContext: RequestContextFactory;
+    userAgent?: string;
+}
+declare enum Operation {
+    Delete = "delete",
+    Read = "read",
+    Write = "write"
+}
+type RequestContextFactory = (options: {
+    operation: Operation;
+}) => RequestContext | null;
+interface RequestContext {
+    host: string;
+    logger?: Logger;
+    token: string;
+    url: string;
+}
+
+type NetlifyCacheOptions = EnvironmentOptions & {
+    name: string;
+};
+declare const getInternalHeaders: unique symbol;
+declare const serializeResourceHeaders: unique symbol;
+declare class NetlifyCache implements Cache {
+    #private;
+    constructor({ getContext, name, userAgent }: NetlifyCacheOptions);
+    private [getInternalHeaders];
+    private [serializeResourceHeaders];
+    add(request: RequestInfo): Promise<void>;
+    addAll(requests: RequestInfo[]): Promise<void>;
+    delete(request: RequestInfo): Promise<boolean>;
+    keys(_request?: Request): Promise<never[]>;
+    match(request: RequestInfo): Promise<Response | undefined>;
+    matchAll(request?: RequestInfo, _options?: CacheQueryOptions): Promise<readonly Response[]>;
+    put(request: RequestInfo | URL | string, response: Response): Promise<void>;
+}
+
+export { type EnvironmentOptions as E, NetlifyCache as N, Operation as O, type RequestContextFactory as R };

package/dist/main.cjs

@@ -340,14 +340,20 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
     return cached;
   }
   const fresh = await fetch(request, requestInit);
-  const responseForCache = setCacheHeaders(fresh.clone(), cacheSettings);
-  const cachePut = cache.put(request, responseForCache);
+  if (!fresh.body) {
+    return fresh;
+  }
+  const [clientStream, cacheStream] = fresh.body.tee();
+  const clientResponse = new Response(clientStream, fresh);
+  const cacheResponse = new Response(cacheStream, fresh);
+  applyHeaders(cacheResponse.headers, cacheHeaders(cacheSettings));
+  const cachePut = cache.put(request, cacheResponse);
   if (onCachePut) {
     await onCachePut(cachePut);
   } else {
     await cachePut;
   }
-  return fresh;
+  return clientResponse;
 };
 
 // src/constants.ts

package/dist/main.d.cts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-7af07baa.js';
+import { N as NetlifyCache } from './cache-BHHI9pin.cjs';
 
 /**
  * Polyfill for local development environments where `globalThis.caches` is not

package/dist/main.d.ts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-7af07baa.js';
+import { N as NetlifyCache } from './cache-BHHI9pin.js';
 
 /**
  * Polyfill for local development environments where `globalThis.caches` is not

package/dist/main.js

@@ -306,14 +306,20 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
     return cached;
   }
   const fresh = await fetch(request, requestInit);
-  const responseForCache = setCacheHeaders(fresh.clone(), cacheSettings);
-  const cachePut = cache.put(request, responseForCache);
+  if (!fresh.body) {
+    return fresh;
+  }
+  const [clientStream, cacheStream] = fresh.body.tee();
+  const clientResponse = new Response(clientStream, fresh);
+  const cacheResponse = new Response(cacheStream, fresh);
+  applyHeaders(cacheResponse.headers, cacheHeaders(cacheSettings));
+  const cachePut = cache.put(request, cacheResponse);
   if (onCachePut) {
     await onCachePut(cachePut);
   } else {
     await cachePut;
   }
-  return fresh;
+  return clientResponse;
 };
 
 // src/constants.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "TypeScript utilities for interacting with the Netlify cache",
   "type": "module",
   "engines": {
@@ -67,10 +67,14 @@
   },
   "author": "Netlify Inc.",
   "devDependencies": {
+    "@netlify/dev-utils": "2.0.0",
     "npm-run-all2": "^7.0.2",
     "semver": "^7.5.3",
     "tmp-promise": "^3.0.3",
-    "tsup": "^7.2.0",
-    "vitest": "^0.34.0"
+    "tsup": "^8.0.0",
+    "vitest": "^3.0.0"
+  },
+  "dependencies": {
+    "@netlify/runtime-utils": "1.1.0"
   }
 }