@jam-comments/server-utilities 5.9.0 → 5.10.0

package/dist/cjs/index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.store = exports.logError = exports.log = exports.removeFalseyValues = exports.fetchAll = exports.markupFetcher = void 0;
-const store_1 = __importDefault(require("./store"));
-exports.store = store_1.default;
+exports.Store = exports.logError = exports.log = exports.removeFalseyValues = exports.fetchAll = exports.markupFetcher = void 0;
 var markupFetcher_1 = require("./markupFetcher");
 Object.defineProperty(exports, "markupFetcher", { enumerable: true, get: function () { return markupFetcher_1.markupFetcher; } });
 Object.defineProperty(exports, "fetchAll", { enumerable: true, get: function () { return markupFetcher_1.fetchAll; } });
@@ -14,3 +12,5 @@ Object.defineProperty(exports, "removeFalseyValues", { enumerable: true, get: fu
 var log_1 = require("./log");
 Object.defineProperty(exports, "log", { enumerable: true, get: function () { return log_1.log; } });
 Object.defineProperty(exports, "logError", { enumerable: true, get: function () { return log_1.logError; } });
+var store_1 = require("./store");
+Object.defineProperty(exports, "Store", { enumerable: true, get: function () { return __importDefault(store_1).default; } });

package/dist/cjs/markupFetcher.js

@@ -12,9 +12,8 @@ const injectSchema_1 = require("./injectSchema");
 const utils_1 = require("./utils");
 const store_1 = __importDefault(require("./store"));
 const BASE_URL = "https://go.jamcomments.com";
-async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey, baseUrl = BASE_URL, environment = (0, utils_1.getEnvironment)(), copy = {}, }, platform, fetchImplementation = fetch, batchMarkupFetcherImpl = batchMarkupFetcher) {
+async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey, baseUrl = BASE_URL, environment = (0, utils_1.getEnvironment)(), copy = {}, }, platform, fetchImplementation = fetch, batchMarkupFetcherImpl = batchMarkupFetcher, store = new store_1.default()) {
     const fetchBatchMarkup = batchMarkupFetcherImpl(platform, fetchImplementation);
-    store_1.default.init();
     let shouldKeepFetching = true;
     let page = 1;
     console.log("Fetching comments from JamComments! This might take a sec.");
@@ -32,7 +31,7 @@ async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey
             });
             console.log(`Checking for comment data. Batch: ${current_page}/${last_page}`);
             items.forEach((item) => {
-                store_1.default.set(item.path, item.markup);
+                store.set(item.path, item.markup);
             });
             if (current_page === last_page) {
                 shouldKeepFetching = false;
@@ -43,9 +42,10 @@ async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey
         }
     }
     catch (error) {
-        store_1.default.clear();
+        store.clear();
         throw error;
     }
+    return store.store;
 }
 function batchMarkupFetcher(platform, fetchImplementation = fetch) {
     return async ({ tz, copy, domain, apiKey, dateFormat, baseUrl = BASE_URL, environment = (0, utils_1.getEnvironment)(), page = 1, }) => {
@@ -100,19 +100,17 @@ async function makeMarkupRequest({ tz, path, page, domain, apiKey, dateFormat, c
     }
     return response;
 }
-function markupFetcher(platform, fetchImplementation = fetch) {
+function markupFetcher(platform, fetchImplementation = fetch, store = new store_1.default()) {
     return async ({ tz = undefined, path, domain, apiKey, schema, dateFormat, baseUrl = BASE_URL, environment = (0, utils_1.getEnvironment)(), copy = {}, }) => {
         path = path || "/";
-        const savedFile = (() => {
-            if (!store_1.default.isInitialized()) {
-                console.log("Store is not initialized.");
+        const cachedMarkup = (() => {
+            if (!store.hasData) {
                 return null;
             }
-            console.log("Getting cached comment markup");
-            return store_1.default.get(path) || store_1.default.getEmptyMarkup();
+            return store.get(path) || store.emptyMarkup;
         })();
-        const markup = savedFile
-            ? savedFile
+        const markup = cachedMarkup
+            ? cachedMarkup
             : await fetchFreshMarkup({ tz, path, domain, apiKey, baseUrl, environment, copy, dateFormat }, fetchImplementation, platform);
         if (schema) {
             const preparedSchema = typeof schema !== "string" ? JSON.stringify(schema) : schema;

package/dist/cjs/markupFetcher.test.js

@@ -22,25 +22,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const injectSchema = __importStar(require("./injectSchema"));
 const fetcherExports = __importStar(require("./markupFetcher"));
 const node_test_1 = require("node:test");
-const store_1 = __importDefault(require("./store"));
 const { markupFetcher, batchMarkupFetcher } = fetcherExports;
 (0, vitest_1.beforeEach)(() => {
-    store_1.default.clear();
+    globalThis.jamCommentsStore = new Map();
 });
 (0, node_test_1.afterEach)(() => {
     vitest_1.vi.resetAllMocks();
 });
 (0, vitest_1.describe)("fetchAll()", () => {
     (0, vitest_1.it)("fetches all comments in a single request", async () => {
-        const saveFileSpy = vitest_1.vi.spyOn(store_1.default, "set");
+        const store = {
+            set: vitest_1.vi.fn(),
+        };
         const mockBatchFetcher = vitest_1.vi.fn().mockReturnValue({
             data: [
                 { path: "/test", markup: "markup1" },
@@ -63,7 +61,7 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
             domain: "test.com",
             apiKey: "123abc",
             environment: "production",
-        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock, store);
         (0, vitest_1.expect)(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", vitest_1.expect.anything());
         (0, vitest_1.expect)(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -75,12 +73,14 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
             page: 1,
             tz: undefined,
         });
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledTimes(2);
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledWith("/test", "markup1");
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledWith("/test2", "markup2");
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledTimes(2);
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledWith("/test", "markup1");
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledWith("/test2", "markup2");
     });
     (0, vitest_1.it)("fetches all comments in multiple requests", async () => {
-        const saveFileSpy = vitest_1.vi.spyOn(store_1.default, "set");
+        const store = {
+            set: vitest_1.vi.fn(),
+        };
         const mockBatchFetcher = vitest_1.vi
             .fn()
             .mockReturnValueOnce({
@@ -118,7 +118,7 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
             domain: "test.com",
             apiKey: "123abc",
             environment: "production",
-        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock, store);
         (0, vitest_1.expect)(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", vitest_1.expect.anything());
         (0, vitest_1.expect)(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -141,12 +141,14 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
             page: 2,
             tz: undefined,
         });
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledTimes(4);
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledWith("/test", "markup1");
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledWith("/test2", "markup2");
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledTimes(4);
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledWith("/test", "markup1");
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledWith("/test2", "markup2");
     });
     (0, vitest_1.it)("deletes the temp directory of anything fails", async () => {
-        const deleteTempDirectorySpy = vitest_1.vi.spyOn(store_1.default, "clear");
+        const store = {
+            clear: vitest_1.vi.fn(),
+        };
         const mockBatchFetcher = vitest_1.vi.fn().mockImplementation(() => {
             throw new Error("test error");
         });
@@ -158,15 +160,17 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
-            }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock);
+            }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock, store);
         }
         catch (e) {
             (0, vitest_1.expect)(e.message).toEqual("test error");
         }
-        (0, vitest_1.expect)(deleteTempDirectorySpy).toHaveBeenCalledOnce();
+        (0, vitest_1.expect)(store.clear).toHaveBeenCalledOnce();
     });
     (0, vitest_1.it)("handles copy overrides", async () => {
-        const saveFileSpy = vitest_1.vi.spyOn(store_1.default, "set");
+        const store = {
+            set: vitest_1.vi.fn(),
+        };
         const mockBatchFetcher = vitest_1.vi.fn().mockReturnValue({
             data: [
                 { path: "/test", markup: "markup1" },
@@ -193,7 +197,7 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
                 copy_confirmation_message: "custom confirmation message",
                 copy_submit_button: "custom submit button",
             },
-        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vitest_1.vi.fn(), batchMarkupFetcherMock, store);
         (0, vitest_1.expect)(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", vitest_1.expect.anything());
         (0, vitest_1.expect)(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -207,7 +211,7 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
             page: 1,
             tz: undefined,
         });
-        (0, vitest_1.expect)(saveFileSpy).toHaveBeenCalledTimes(2);
+        (0, vitest_1.expect)(store.set).toHaveBeenCalledTimes(2);
     });
     (0, vitest_1.it)("allows you to pass a custom date format", async () => {
         const mockBatchFetcher = vitest_1.vi.fn().mockReturnValue({
@@ -498,10 +502,10 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
     });
     (0, vitest_1.describe)("using saved markup", () => {
         (0, vitest_1.it)("makes fresh request when temp directory does not exist", async () => {
-            const tempDirectoryExistsSpy = vitest_1.vi
-                .spyOn(store_1.default, "isInitialized")
-                .mockReturnValue(false);
-            const readFileSpy = vitest_1.vi.spyOn(store_1.default, "get");
+            const store = {
+                hasData: false,
+                get: vitest_1.vi.fn().mockReturnValue(null),
+            };
             const fetchMock = vitest_1.vi.fn().mockImplementation(() => {
                 return {
                     status: 200,
@@ -516,50 +520,42 @@ const { markupFetcher, batchMarkupFetcher } = fetcherExports;
                 apiKey: "123abc",
                 environment: "production",
             });
-            (0, vitest_1.expect)(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            (0, vitest_1.expect)(readFileSpy).not.toHaveBeenCalled();
+            (0, vitest_1.expect)(store.get).not.toHaveBeenCalled();
             (0, vitest_1.expect)(fetchMock).toHaveBeenCalledWith("https://go.jamcomments.com/api/v3/markup?domain=test.com&path=%2Ftest", vitest_1.expect.anything());
             (0, vitest_1.expect)(result).toEqual("results!");
         });
         (0, vitest_1.it)("uses saved markup when it exists", async () => {
-            const tempDirectoryExistsSpy = vitest_1.vi
-                .spyOn(store_1.default, "isInitialized")
-                .mockReturnValue(true);
-            const readFileSpy = vitest_1.vi
-                .spyOn(store_1.default, "get")
-                .mockReturnValue("saved markup");
+            const store = {
+                hasData: true,
+                get: vitest_1.vi.fn().mockReturnValue("saved markup"),
+            };
             const fetchMock = vitest_1.vi.fn();
-            const fetcher = markupFetcher("test", fetchMock);
+            const fetcher = markupFetcher("test", fetchMock, store);
             const result = await fetcher({
                 path: "/test",
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
             });
-            (0, vitest_1.expect)(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            (0, vitest_1.expect)(readFileSpy).toHaveBeenCalledOnce();
+            (0, vitest_1.expect)(store.get).toHaveBeenCalledOnce();
             (0, vitest_1.expect)(fetchMock).not.toHaveBeenCalled();
             (0, vitest_1.expect)(result).toEqual("saved markup");
         });
         (0, vitest_1.it)("uses the EMPTY template when there's no saved file for a post", async () => {
-            const tempDirectoryExistsSpy = vitest_1.vi
-                .spyOn(store_1.default, "isInitialized")
-                .mockReturnValue(true);
-            const readFileSpy = vitest_1.vi.spyOn(store_1.default, "get").mockReturnValue(null);
-            const getEmptyMarkupSpy = vitest_1.vi
-                .spyOn(store_1.default, "getEmptyMarkup")
-                .mockReturnValue("<!-- EMPTY -->");
+            const store = {
+                get: vitest_1.vi.fn().mockReturnValue(null),
+                emptyMarkup: "<!-- EMPTY -->",
+                hasData: true,
+            };
             const fetchMock = vitest_1.vi.fn();
-            const fetcher = markupFetcher("test", fetchMock);
+            const fetcher = markupFetcher("test", fetchMock, store);
             const result = await fetcher({
                 path: "/test",
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
             });
-            (0, vitest_1.expect)(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            (0, vitest_1.expect)(readFileSpy).toHaveBeenCalledOnce();
-            (0, vitest_1.expect)(getEmptyMarkupSpy).toHaveBeenCalledOnce();
+            (0, vitest_1.expect)(store.get).toHaveBeenCalledOnce();
             (0, vitest_1.expect)(fetchMock).not.toHaveBeenCalled();
             (0, vitest_1.expect)(result).toEqual("<!-- EMPTY -->");
         });

package/dist/cjs/store.js

@@ -1,32 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-let STORE = null;
-const store = {
-    init() {
-        if (!STORE) {
-            STORE = new Map();
-        }
-    },
-    isInitialized() {
-        return STORE !== null;
-    },
+class Store {
+    store;
+    constructor() {
+        globalThis.jamCommentsStore =
+            globalThis.jamCommentsStore || new Map();
+        this.store = globalThis.jamCommentsStore;
+    }
     set(path, markup) {
-        STORE.set(store.toPathKey(path), markup);
-    },
+        this.store.set(path, markup);
+    }
     get(path) {
-        return STORE.get(store.toPathKey(path)) || null;
-    },
+        return this.store.get(path) || null;
+    }
     clear() {
-        if (STORE) {
-            STORE.clear();
-            STORE = null;
-        }
-    },
-    getEmptyMarkup() {
-        return STORE.get("EMPTY");
-    },
-    toPathKey(path) {
-        return path.replace(/^\//, "").replace(/\//g, "::");
-    },
-};
-exports.default = store;
+        this.store.clear();
+    }
+    get hasData() {
+        return this.store.size > 0;
+    }
+    get emptyMarkup() {
+        return this.store.get("EMPTY") || null;
+    }
+}
+exports.default = Store;

package/dist/esm/index.js

@@ -1,5 +1,4 @@
-import store from "./store";
 export { markupFetcher, fetchAll } from "./markupFetcher";
 export { removeFalseyValues } from "./utils";
 export { log, logError } from "./log";
-export { store };
+export { default as Store } from "./store";

package/dist/esm/markupFetcher.js

@@ -1,10 +1,9 @@
 import { injectSchema } from "./injectSchema";
 import { getEnvironment, isValidTimezone, parseJson } from "./utils";
-import store from "./store";
+import Store from "./store";
 const BASE_URL = "https://go.jamcomments.com";
-export async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey, baseUrl = BASE_URL, environment = getEnvironment(), copy = {}, }, platform, fetchImplementation = fetch, batchMarkupFetcherImpl = batchMarkupFetcher) {
+export async function fetchAll({ tz = undefined, dateFormat = undefined, domain, apiKey, baseUrl = BASE_URL, environment = getEnvironment(), copy = {}, }, platform, fetchImplementation = fetch, batchMarkupFetcherImpl = batchMarkupFetcher, store = new Store()) {
     const fetchBatchMarkup = batchMarkupFetcherImpl(platform, fetchImplementation);
-    store.init();
     let shouldKeepFetching = true;
     let page = 1;
     console.log("Fetching comments from JamComments! This might take a sec.");
@@ -36,6 +35,7 @@ export async function fetchAll({ tz = undefined, dateFormat = undefined, domain,
         store.clear();
         throw error;
     }
+    return store.store;
 }
 export function batchMarkupFetcher(platform, fetchImplementation = fetch) {
     return async ({ tz, copy, domain, apiKey, dateFormat, baseUrl = BASE_URL, environment = getEnvironment(), page = 1, }) => {
@@ -90,19 +90,17 @@ export async function makeMarkupRequest({ tz, path, page, domain, apiKey, dateFo
     }
     return response;
 }
-export function markupFetcher(platform, fetchImplementation = fetch) {
+export function markupFetcher(platform, fetchImplementation = fetch, store = new Store()) {
     return async ({ tz = undefined, path, domain, apiKey, schema, dateFormat, baseUrl = BASE_URL, environment = getEnvironment(), copy = {}, }) => {
         path = path || "/";
-        const savedFile = (() => {
-            if (!store.isInitialized()) {
-                console.log("Store is not initialized.");
+        const cachedMarkup = (() => {
+            if (!store.hasData) {
                 return null;
             }
-            console.log("Getting cached comment markup");
-            return store.get(path) || store.getEmptyMarkup();
+            return store.get(path) || store.emptyMarkup;
         })();
-        const markup = savedFile
-            ? savedFile
+        const markup = cachedMarkup
+            ? cachedMarkup
             : await fetchFreshMarkup({ tz, path, domain, apiKey, baseUrl, environment, copy, dateFormat }, fetchImplementation, platform);
         if (schema) {
             const preparedSchema = typeof schema !== "string" ? JSON.stringify(schema) : schema;

package/dist/esm/markupFetcher.test.js

@@ -2,17 +2,18 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import * as injectSchema from "./injectSchema";
 import * as fetcherExports from "./markupFetcher";
 import { afterEach } from "node:test";
-import store from "./store";
 const { markupFetcher, batchMarkupFetcher } = fetcherExports;
 beforeEach(() => {
-    store.clear();
+    globalThis.jamCommentsStore = new Map();
 });
 afterEach(() => {
     vi.resetAllMocks();
 });
 describe("fetchAll()", () => {
     it("fetches all comments in a single request", async () => {
-        const saveFileSpy = vi.spyOn(store, "set");
+        const store = {
+            set: vi.fn(),
+        };
         const mockBatchFetcher = vi.fn().mockReturnValue({
             data: [
                 { path: "/test", markup: "markup1" },
@@ -35,7 +36,7 @@ describe("fetchAll()", () => {
             domain: "test.com",
             apiKey: "123abc",
             environment: "production",
-        }, "test_platform", vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vi.fn(), batchMarkupFetcherMock, store);
         expect(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", expect.anything());
         expect(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -47,12 +48,14 @@ describe("fetchAll()", () => {
             page: 1,
             tz: undefined,
         });
-        expect(saveFileSpy).toHaveBeenCalledTimes(2);
-        expect(saveFileSpy).toHaveBeenCalledWith("/test", "markup1");
-        expect(saveFileSpy).toHaveBeenCalledWith("/test2", "markup2");
+        expect(store.set).toHaveBeenCalledTimes(2);
+        expect(store.set).toHaveBeenCalledWith("/test", "markup1");
+        expect(store.set).toHaveBeenCalledWith("/test2", "markup2");
     });
     it("fetches all comments in multiple requests", async () => {
-        const saveFileSpy = vi.spyOn(store, "set");
+        const store = {
+            set: vi.fn(),
+        };
         const mockBatchFetcher = vi
             .fn()
             .mockReturnValueOnce({
@@ -90,7 +93,7 @@ describe("fetchAll()", () => {
             domain: "test.com",
             apiKey: "123abc",
             environment: "production",
-        }, "test_platform", vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vi.fn(), batchMarkupFetcherMock, store);
         expect(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", expect.anything());
         expect(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -113,12 +116,14 @@ describe("fetchAll()", () => {
             page: 2,
             tz: undefined,
         });
-        expect(saveFileSpy).toHaveBeenCalledTimes(4);
-        expect(saveFileSpy).toHaveBeenCalledWith("/test", "markup1");
-        expect(saveFileSpy).toHaveBeenCalledWith("/test2", "markup2");
+        expect(store.set).toHaveBeenCalledTimes(4);
+        expect(store.set).toHaveBeenCalledWith("/test", "markup1");
+        expect(store.set).toHaveBeenCalledWith("/test2", "markup2");
     });
     it("deletes the temp directory of anything fails", async () => {
-        const deleteTempDirectorySpy = vi.spyOn(store, "clear");
+        const store = {
+            clear: vi.fn(),
+        };
         const mockBatchFetcher = vi.fn().mockImplementation(() => {
             throw new Error("test error");
         });
@@ -130,15 +135,17 @@ describe("fetchAll()", () => {
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
-            }, "test_platform", vi.fn(), batchMarkupFetcherMock);
+            }, "test_platform", vi.fn(), batchMarkupFetcherMock, store);
         }
         catch (e) {
             expect(e.message).toEqual("test error");
         }
-        expect(deleteTempDirectorySpy).toHaveBeenCalledOnce();
+        expect(store.clear).toHaveBeenCalledOnce();
     });
     it("handles copy overrides", async () => {
-        const saveFileSpy = vi.spyOn(store, "set");
+        const store = {
+            set: vi.fn(),
+        };
         const mockBatchFetcher = vi.fn().mockReturnValue({
             data: [
                 { path: "/test", markup: "markup1" },
@@ -165,7 +172,7 @@ describe("fetchAll()", () => {
                 copy_confirmation_message: "custom confirmation message",
                 copy_submit_button: "custom submit button",
             },
-        }, "test_platform", vi.fn(), batchMarkupFetcherMock);
+        }, "test_platform", vi.fn(), batchMarkupFetcherMock, store);
         expect(batchMarkupFetcherMock).toHaveBeenCalledWith("test_platform", expect.anything());
         expect(mockBatchFetcher).toHaveBeenCalledWith({
             domain: "test.com",
@@ -179,7 +186,7 @@ describe("fetchAll()", () => {
             page: 1,
             tz: undefined,
         });
-        expect(saveFileSpy).toHaveBeenCalledTimes(2);
+        expect(store.set).toHaveBeenCalledTimes(2);
     });
     it("allows you to pass a custom date format", async () => {
         const mockBatchFetcher = vi.fn().mockReturnValue({
@@ -470,10 +477,10 @@ describe("markupFetcher", () => {
     });
     describe("using saved markup", () => {
         it("makes fresh request when temp directory does not exist", async () => {
-            const tempDirectoryExistsSpy = vi
-                .spyOn(store, "isInitialized")
-                .mockReturnValue(false);
-            const readFileSpy = vi.spyOn(store, "get");
+            const store = {
+                hasData: false,
+                get: vi.fn().mockReturnValue(null),
+            };
             const fetchMock = vi.fn().mockImplementation(() => {
                 return {
                     status: 200,
@@ -488,50 +495,42 @@ describe("markupFetcher", () => {
                 apiKey: "123abc",
                 environment: "production",
             });
-            expect(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            expect(readFileSpy).not.toHaveBeenCalled();
+            expect(store.get).not.toHaveBeenCalled();
             expect(fetchMock).toHaveBeenCalledWith("https://go.jamcomments.com/api/v3/markup?domain=test.com&path=%2Ftest", expect.anything());
             expect(result).toEqual("results!");
         });
         it("uses saved markup when it exists", async () => {
-            const tempDirectoryExistsSpy = vi
-                .spyOn(store, "isInitialized")
-                .mockReturnValue(true);
-            const readFileSpy = vi
-                .spyOn(store, "get")
-                .mockReturnValue("saved markup");
+            const store = {
+                hasData: true,
+                get: vi.fn().mockReturnValue("saved markup"),
+            };
             const fetchMock = vi.fn();
-            const fetcher = markupFetcher("test", fetchMock);
+            const fetcher = markupFetcher("test", fetchMock, store);
             const result = await fetcher({
                 path: "/test",
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
             });
-            expect(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            expect(readFileSpy).toHaveBeenCalledOnce();
+            expect(store.get).toHaveBeenCalledOnce();
             expect(fetchMock).not.toHaveBeenCalled();
             expect(result).toEqual("saved markup");
         });
         it("uses the EMPTY template when there's no saved file for a post", async () => {
-            const tempDirectoryExistsSpy = vi
-                .spyOn(store, "isInitialized")
-                .mockReturnValue(true);
-            const readFileSpy = vi.spyOn(store, "get").mockReturnValue(null);
-            const getEmptyMarkupSpy = vi
-                .spyOn(store, "getEmptyMarkup")
-                .mockReturnValue("<!-- EMPTY -->");
+            const store = {
+                get: vi.fn().mockReturnValue(null),
+                emptyMarkup: "<!-- EMPTY -->",
+                hasData: true,
+            };
             const fetchMock = vi.fn();
-            const fetcher = markupFetcher("test", fetchMock);
+            const fetcher = markupFetcher("test", fetchMock, store);
             const result = await fetcher({
                 path: "/test",
                 domain: "test.com",
                 apiKey: "123abc",
                 environment: "production",
             });
-            expect(tempDirectoryExistsSpy).toHaveBeenCalledOnce();
-            expect(readFileSpy).toHaveBeenCalledOnce();
-            expect(getEmptyMarkupSpy).toHaveBeenCalledOnce();
+            expect(store.get).toHaveBeenCalledOnce();
             expect(fetchMock).not.toHaveBeenCalled();
             expect(result).toEqual("<!-- EMPTY -->");
         });

package/dist/esm/store.js

@@ -1,30 +1,24 @@
-let STORE = null;
-const store = {
-    init() {
-        if (!STORE) {
-            STORE = new Map();
-        }
-    },
-    isInitialized() {
-        return STORE !== null;
-    },
+class Store {
+    store;
+    constructor() {
+        globalThis.jamCommentsStore =
+            globalThis.jamCommentsStore || new Map();
+        this.store = globalThis.jamCommentsStore;
+    }
     set(path, markup) {
-        STORE.set(store.toPathKey(path), markup);
-    },
+        this.store.set(path, markup);
+    }
     get(path) {
-        return STORE.get(store.toPathKey(path)) || null;
-    },
+        return this.store.get(path) || null;
+    }
     clear() {
-        if (STORE) {
-            STORE.clear();
-            STORE = null;
-        }
-    },
-    getEmptyMarkup() {
-        return STORE.get("EMPTY");
-    },
-    toPathKey(path) {
-        return path.replace(/^\//, "").replace(/\//g, "::");
-    },
-};
-export default store;
+        this.store.clear();
+    }
+    get hasData() {
+        return this.store.size > 0;
+    }
+    get emptyMarkup() {
+        return this.store.get("EMPTY") || null;
+    }
+}
+export default Store;

package/dist/types/index.d.ts

@@ -1,6 +1,5 @@
 export type { CustomCopy } from "./markupFetcher";
-import store from "./store";
 export { markupFetcher, fetchAll } from "./markupFetcher";
 export { removeFalseyValues } from "./utils";
 export { log, logError } from "./log";
-export { store };
+export { default as Store } from "./store";

package/dist/types/markupFetcher.d.ts

@@ -1,3 +1,4 @@
+import Store from "./store";
 export interface CustomCopy {
     confirmationMessage?: string;
     submitButton?: string;
@@ -48,9 +49,9 @@ interface IBatchResponse {
         total: number;
     };
 }
-export declare function fetchAll({ tz, dateFormat, domain, apiKey, baseUrl, environment, copy, }: IBatchFetchData, platform: string, fetchImplementation?: any, batchMarkupFetcherImpl?: any): Promise<void>;
+export declare function fetchAll({ tz, dateFormat, domain, apiKey, baseUrl, environment, copy, }: IBatchFetchData, platform: string, fetchImplementation?: any, batchMarkupFetcherImpl?: any, store?: Store): Promise<Map<string, string>>;
 export declare function batchMarkupFetcher(platform: string, fetchImplementation?: typeof fetch): (args: IBatchFetchData) => Promise<IBatchResponse>;
 export declare function fetchFreshMarkup({ tz, path, copy, domain, apiKey, dateFormat, baseUrl, environment, }: IFetchData, fetchImplementation: typeof fetch, platform: string): Promise<string>;
 export declare function makeMarkupRequest<T extends Partial<IBatchFetchData & IFetchData>>({ tz, path, page, domain, apiKey, dateFormat, copy, baseUrl, environment, }: T, baseServicePath: string, fetchImplementation: typeof fetch, platform: string): Promise<Response>;
-export declare function markupFetcher(platform: string, fetchImplementation?: typeof fetch): (args: IFetchData) => Promise<string>;
+export declare function markupFetcher(platform: string, fetchImplementation?: typeof fetch, store?: Store): (args: IFetchData) => Promise<string>;
 export {};

package/dist/types/store.d.ts

@@ -1,10 +1,10 @@
-declare const store: {
-    init(): void;
-    isInitialized(): boolean;
+declare class Store {
+    store: Map<string, string>;
+    constructor();
     set(path: string, markup: string): void;
-    get(path: string): any;
+    get(path: string): string | null;
     clear(): void;
-    getEmptyMarkup(): any;
-    toPathKey(path: string): string;
-};
-export default store;
+    get hasData(): boolean;
+    get emptyMarkup(): string | null;
+}
+export default Store;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jam-comments/server-utilities",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "description": "Various JavaScript utilities for JamComments.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",