@netlify/cache 1.2.0 → 1.4.0

package/dist/bootstrap/main.cjs

@@ -55,29 +55,24 @@ 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, _getHost, _getToken, _getURL, _name, _userAgent;
+var _base64Encode, _getContext, _name, _userAgent;
 var NetlifyCache = class {
-  constructor({ base64Encode, getHost, getToken, getURL, name, userAgent }) {
+  constructor({ base64Encode, getContext, name, userAgent }) {
     __privateAdd(this, _base64Encode, void 0);
-    __privateAdd(this, _getHost, void 0);
-    __privateAdd(this, _getToken, void 0);
-    __privateAdd(this, _getURL, void 0);
+    __privateAdd(this, _getContext, void 0);
     __privateAdd(this, _name, void 0);
     __privateAdd(this, _userAgent, void 0);
     __privateSet(this, _base64Encode, base64Encode);
-    __privateSet(this, _getHost, getHost);
-    __privateSet(this, _getToken, getToken);
-    __privateSet(this, _getURL, getURL);
+    __privateSet(this, _getContext, getContext);
     __privateSet(this, _name, name);
     __privateSet(this, _userAgent, userAgent);
   }
-  [getInternalHeaders]() {
-    var _a;
+  [getInternalHeaders](requestContext) {
+    const { host, token } = requestContext;
     const headers = {
-      Authorization: `Bearer ${__privateGet(this, _getToken).call(this)}`,
+      Authorization: `Bearer ${token}`,
       [ResourceStore]: __privateGet(this, _name)
     };
-    const host = (_a = __privateGet(this, _getHost)) == null ? void 0 : _a.call(this);
     if (host) {
       headers[NetlifyForwardedHost] = host;
     }
@@ -109,9 +104,10 @@ var NetlifyCache = class {
   }
   // eslint-disable-next-line class-methods-use-this, require-await, @typescript-eslint/no-unused-vars
   async delete(request) {
+    const context = __privateGet(this, _getContext).call(this);
     const resourceURL = extractAndValidateURL(request);
-    await fetch(`${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`, {
-      headers: this[getInternalHeaders](),
+    await fetch(`${context.url}/${toCacheKey(resourceURL)}`, {
+      headers: this[getInternalHeaders](context),
       method: "DELETE"
     });
     return true;
@@ -122,10 +118,11 @@ var NetlifyCache = class {
   }
   async match(request) {
     try {
+      const context = __privateGet(this, _getContext).call(this);
       const resourceURL = extractAndValidateURL(request);
-      const cacheURL = `${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`;
+      const cacheURL = `${context.url}/${toCacheKey(resourceURL)}`;
       const response = await fetch(cacheURL, {
-        headers: this[getInternalHeaders](),
+        headers: this[getInternalHeaders](context),
         method: "GET"
       });
       if (!response.ok) {
@@ -156,11 +153,12 @@ var NetlifyCache = class {
     if (response.headers.get("vary")?.includes("*")) {
       throw new TypeError("Cannot cache response with 'Vary: *' header.");
     }
+    const context = __privateGet(this, _getContext).call(this);
     const resourceURL = extractAndValidateURL(request);
-    await fetch(`${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`, {
+    await fetch(`${context.url}/${toCacheKey(resourceURL)}`, {
       body: response.body,
       headers: {
-        ...this[getInternalHeaders](),
+        ...this[getInternalHeaders](context),
         [ResourceHeaders]: this[serializeResourceHeaders](response.headers),
         [ResourceStatus]: response.status.toString()
       },
@@ -171,9 +169,7 @@ var NetlifyCache = class {
   }
 };
 _base64Encode = new WeakMap();
-_getHost = new WeakMap();
-_getToken = new WeakMap();
-_getURL = new WeakMap();
+_getContext = new WeakMap();
 _name = new WeakMap();
 _userAgent = new WeakMap();
 var extractAndValidateURL = (input) => {

package/dist/bootstrap/main.d.cts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions, F as Factory } from '../cache-7ef2f22d.js';
-export { B as Base64Encoder, N as NetlifyCache } from '../cache-7ef2f22d.js';
+import { E as EnvironmentOptions } from '../cache-854474ad.js';
+export { B as Base64Encoder, N as NetlifyCache, R as RequestContextFactory } from '../cache-854474ad.js';
 
 declare class NetlifyCacheStorage {
     #private;
@@ -11,8 +11,4 @@ declare class NetlifyCacheStorage {
     match(request: RequestInfo, options?: MultiCacheQueryOptions): Promise<Response | undefined>;
 }
 
-type HostFactory = Factory<string>;
-type TokenFactory = Factory<string>;
-type URLFactory = Factory<string>;
-
-export { HostFactory, NetlifyCacheStorage, TokenFactory, URLFactory };
+export { NetlifyCacheStorage };

package/dist/bootstrap/main.d.ts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions, F as Factory } from '../cache-7ef2f22d.js';
-export { B as Base64Encoder, N as NetlifyCache } from '../cache-7ef2f22d.js';
+import { E as EnvironmentOptions } from '../cache-854474ad.js';
+export { B as Base64Encoder, N as NetlifyCache, R as RequestContextFactory } from '../cache-854474ad.js';
 
 declare class NetlifyCacheStorage {
     #private;
@@ -11,8 +11,4 @@ declare class NetlifyCacheStorage {
     match(request: RequestInfo, options?: MultiCacheQueryOptions): Promise<Response | undefined>;
 }
 
-type HostFactory = Factory<string>;
-type TokenFactory = Factory<string>;
-type URLFactory = Factory<string>;
-
-export { HostFactory, NetlifyCacheStorage, TokenFactory, URLFactory };
+export { NetlifyCacheStorage };

package/dist/bootstrap/main.js

@@ -14,29 +14,24 @@ 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, _getHost, _getToken, _getURL, _name, _userAgent;
+var _base64Encode, _getContext, _name, _userAgent;
 var NetlifyCache = class {
-  constructor({ base64Encode, getHost, getToken, getURL, name, userAgent }) {
+  constructor({ base64Encode, getContext, name, userAgent }) {
     __privateAdd(this, _base64Encode, void 0);
-    __privateAdd(this, _getHost, void 0);
-    __privateAdd(this, _getToken, void 0);
-    __privateAdd(this, _getURL, void 0);
+    __privateAdd(this, _getContext, void 0);
     __privateAdd(this, _name, void 0);
     __privateAdd(this, _userAgent, void 0);
     __privateSet(this, _base64Encode, base64Encode);
-    __privateSet(this, _getHost, getHost);
-    __privateSet(this, _getToken, getToken);
-    __privateSet(this, _getURL, getURL);
+    __privateSet(this, _getContext, getContext);
     __privateSet(this, _name, name);
     __privateSet(this, _userAgent, userAgent);
   }
-  [getInternalHeaders]() {
-    var _a;
+  [getInternalHeaders](requestContext) {
+    const { host, token } = requestContext;
     const headers = {
-      Authorization: `Bearer ${__privateGet(this, _getToken).call(this)}`,
+      Authorization: `Bearer ${token}`,
       [ResourceStore]: __privateGet(this, _name)
     };
-    const host = (_a = __privateGet(this, _getHost)) == null ? void 0 : _a.call(this);
     if (host) {
       headers[NetlifyForwardedHost] = host;
     }
@@ -68,9 +63,10 @@ var NetlifyCache = class {
   }
   // eslint-disable-next-line class-methods-use-this, require-await, @typescript-eslint/no-unused-vars
   async delete(request) {
+    const context = __privateGet(this, _getContext).call(this);
     const resourceURL = extractAndValidateURL(request);
-    await fetch(`${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`, {
-      headers: this[getInternalHeaders](),
+    await fetch(`${context.url}/${toCacheKey(resourceURL)}`, {
+      headers: this[getInternalHeaders](context),
       method: "DELETE"
     });
     return true;
@@ -81,10 +77,11 @@ var NetlifyCache = class {
   }
   async match(request) {
     try {
+      const context = __privateGet(this, _getContext).call(this);
       const resourceURL = extractAndValidateURL(request);
-      const cacheURL = `${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`;
+      const cacheURL = `${context.url}/${toCacheKey(resourceURL)}`;
       const response = await fetch(cacheURL, {
-        headers: this[getInternalHeaders](),
+        headers: this[getInternalHeaders](context),
         method: "GET"
       });
       if (!response.ok) {
@@ -115,11 +112,12 @@ var NetlifyCache = class {
     if (response.headers.get("vary")?.includes("*")) {
       throw new TypeError("Cannot cache response with 'Vary: *' header.");
     }
+    const context = __privateGet(this, _getContext).call(this);
     const resourceURL = extractAndValidateURL(request);
-    await fetch(`${__privateGet(this, _getURL).call(this)}/${toCacheKey(resourceURL)}`, {
+    await fetch(`${context.url}/${toCacheKey(resourceURL)}`, {
       body: response.body,
       headers: {
-        ...this[getInternalHeaders](),
+        ...this[getInternalHeaders](context),
         [ResourceHeaders]: this[serializeResourceHeaders](response.headers),
         [ResourceStatus]: response.status.toString()
       },
@@ -130,9 +128,7 @@ var NetlifyCache = class {
   }
 };
 _base64Encode = new WeakMap();
-_getHost = new WeakMap();
-_getToken = new WeakMap();
-_getURL = new WeakMap();
+_getContext = new WeakMap();
 _name = new WeakMap();
 _userAgent = new WeakMap();
 var extractAndValidateURL = (input) => {

package/dist/{cache-7ef2f22d.d.ts → cache-854474ad.d.ts}

@@ -1,12 +1,15 @@
 type Base64Encoder = (input: string) => string;
-type Factory<T> = () => T;
 interface EnvironmentOptions {
     base64Encode: Base64Encoder;
-    getHost: Factory<string>;
-    getToken: Factory<string>;
-    getURL: Factory<string>;
+    getContext: RequestContextFactory;
     userAgent?: string;
 }
+type RequestContextFactory = () => RequestContext;
+interface RequestContext {
+    host: string;
+    token: string;
+    url: string;
+}
 
 type NetlifyCacheOptions = EnvironmentOptions & {
     name: string;
@@ -15,7 +18,7 @@ declare const getInternalHeaders: unique symbol;
 declare const serializeResourceHeaders: unique symbol;
 declare class NetlifyCache implements Cache {
     #private;
-    constructor({ base64Encode, getHost, getToken, getURL, name, userAgent }: NetlifyCacheOptions);
+    constructor({ base64Encode, getContext, name, userAgent }: NetlifyCacheOptions);
     private [getInternalHeaders];
     private [serializeResourceHeaders];
     add(request: RequestInfo): Promise<void>;
@@ -27,4 +30,4 @@ declare class NetlifyCache implements Cache {
     put(request: RequestInfo | URL | string, response: Response): Promise<void>;
 }
 
-export { Base64Encoder as B, EnvironmentOptions as E, Factory as F, NetlifyCache as N };
+export { Base64Encoder as B, EnvironmentOptions as E, NetlifyCache as N, RequestContextFactory as R };

package/dist/main.cjs

@@ -20,6 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/main.ts
 var main_exports = {};
 __export(main_exports, {
+  DAY: () => DAY,
+  HOUR: () => HOUR,
+  MINUTE: () => MINUTE,
+  WEEK: () => WEEK,
+  YEAR: () => YEAR,
   fetchWithCache: () => fetchWithCache,
   getCacheStatus: () => getCacheStatus,
   setCacheHeaders: () => setCacheHeaders
@@ -290,8 +295,20 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
   }
   return fresh;
 };
+
+// src/constants.ts
+var MINUTE = 60;
+var HOUR = 60 * MINUTE;
+var DAY = 24 * HOUR;
+var WEEK = 7 * DAY;
+var YEAR = 365 * DAY;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DAY,
+  HOUR,
+  MINUTE,
+  WEEK,
+  YEAR,
   fetchWithCache,
   getCacheStatus,
   setCacheHeaders

package/dist/main.d.cts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-7ef2f22d.js';
+import { N as NetlifyCache } from './cache-854474ad.js';
 
 interface CacheSettings {
     /**
@@ -153,4 +153,25 @@ type FetchWithCache = {
  */
 declare const fetchWithCache: FetchWithCache;
 
-export { fetchWithCache, getCacheStatus, setCacheHeaders };
+/**
+ * Number of seconds in one minute.
+ */
+declare const MINUTE = 60;
+/**
+ * Number of seconds in one hour.
+ */
+declare const HOUR: number;
+/**
+ * Number of seconds in one day.
+ */
+declare const DAY: number;
+/**
+ * Number of seconds in one week.
+ */
+declare const WEEK: number;
+/**
+ * Number of seconds in one year.
+ */
+declare const YEAR: number;
+
+export { DAY, HOUR, MINUTE, WEEK, YEAR, fetchWithCache, getCacheStatus, setCacheHeaders };

package/dist/main.d.ts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-7ef2f22d.js';
+import { N as NetlifyCache } from './cache-854474ad.js';
 
 interface CacheSettings {
     /**
@@ -153,4 +153,25 @@ type FetchWithCache = {
  */
 declare const fetchWithCache: FetchWithCache;
 
-export { fetchWithCache, getCacheStatus, setCacheHeaders };
+/**
+ * Number of seconds in one minute.
+ */
+declare const MINUTE = 60;
+/**
+ * Number of seconds in one hour.
+ */
+declare const HOUR: number;
+/**
+ * Number of seconds in one day.
+ */
+declare const DAY: number;
+/**
+ * Number of seconds in one week.
+ */
+declare const WEEK: number;
+/**
+ * Number of seconds in one year.
+ */
+declare const YEAR: number;
+
+export { DAY, HOUR, MINUTE, WEEK, YEAR, fetchWithCache, getCacheStatus, setCacheHeaders };

package/dist/main.js

@@ -263,7 +263,19 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
   }
   return fresh;
 };
+
+// src/constants.ts
+var MINUTE = 60;
+var HOUR = 60 * MINUTE;
+var DAY = 24 * HOUR;
+var WEEK = 7 * DAY;
+var YEAR = 365 * DAY;
 export {
+  DAY,
+  HOUR,
+  MINUTE,
+  WEEK,
+  YEAR,
   fetchWithCache,
   getCacheStatus,
   setCacheHeaders

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "TypeScript utilities for interacting with the Netlify cache",
   "type": "module",
   "engines": {