@jam-comments/server-utilities 5.10.0 → 5.10.2

package/dist/cjs/index.js

@@ -1,7 +1,4 @@
 "use strict";
-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;
 var markupFetcher_1 = require("./markupFetcher");
@@ -13,4 +10,4 @@ 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; } });
+Object.defineProperty(exports, "Store", { enumerable: true, get: function () { return store_1.Store; } });

package/dist/cjs/markupFetcher.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchAll = fetchAll;
 exports.batchMarkupFetcher = batchMarkupFetcher;
@@ -10,9 +7,9 @@ exports.makeMarkupRequest = makeMarkupRequest;
 exports.markupFetcher = markupFetcher;
 const injectSchema_1 = require("./injectSchema");
 const utils_1 = require("./utils");
-const store_1 = __importDefault(require("./store"));
+const store_1 = 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, store = new store_1.default()) {
+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.Store()) {
     const fetchBatchMarkup = batchMarkupFetcherImpl(platform, fetchImplementation);
     let shouldKeepFetching = true;
     let page = 1;
@@ -100,7 +97,7 @@ async function makeMarkupRequest({ tz, path, page, domain, apiKey, dateFormat, c
     }
     return response;
 }
-function markupFetcher(platform, fetchImplementation = fetch, store = new store_1.default()) {
+function markupFetcher(platform, fetchImplementation = fetch, store = new store_1.Store()) {
     return async ({ tz = undefined, path, domain, apiKey, schema, dateFormat, baseUrl = BASE_URL, environment = (0, utils_1.getEnvironment)(), copy = {}, }) => {
         path = path || "/";
         const cachedMarkup = (() => {

package/dist/cjs/store.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Store = void 0;
 class Store {
     store;
     constructor() {
@@ -8,10 +9,10 @@ class Store {
         this.store = globalThis.jamCommentsStore;
     }
     set(path, markup) {
-        this.store.set(path, markup);
+        this.store.set(this.#normalizePath(path), markup);
     }
     get(path) {
-        return this.store.get(path) || null;
+        return this.store.get(this.#normalizePath(path)) || null;
     }
     clear() {
         this.store.clear();
@@ -22,5 +23,15 @@ class Store {
     get emptyMarkup() {
         return this.store.get("EMPTY") || null;
     }
+    #normalizePath(path) {
+        if (path === "EMPTY") {
+            return path;
+        }
+        let withLeadingSlash = path.startsWith("/") ? path : `/${path}`;
+        let withNoTrailingSlash = withLeadingSlash.endsWith("/")
+            ? withLeadingSlash.slice(0, -1)
+            : withLeadingSlash;
+        return withNoTrailingSlash.toLowerCase();
+    }
 }
-exports.default = Store;
+exports.Store = Store;

package/dist/cjs/store.test.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const store_1 = require("./store");
+(0, vitest_1.describe)("paths", () => {
+    (0, vitest_1.it)("cleans path when setting markup", () => {
+        const store = new store_1.Store();
+        store.set("/path", "markup");
+        (0, vitest_1.expect)(store.get("/path")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path/")).toEqual("markup");
+    });
+    (0, vitest_1.it)("cleans path with mixed casing", () => {
+        const store = new store_1.Store();
+        store.set("/Path", "markup");
+        (0, vitest_1.expect)(store.get("/path")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path/")).toEqual("markup");
+    });
+    (0, vitest_1.it)("works just fine with deep paths", () => {
+        const store = new store_1.Store();
+        store.set("/path/to/deep", "markup");
+        (0, vitest_1.expect)(store.get("/path/to/deep")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path/to/deep")).toEqual("markup");
+        (0, vitest_1.expect)(store.get("path/to/deep/")).toEqual("markup");
+    });
+});
+(0, vitest_1.it)("retrieves EMPTY markup", () => {
+    const store = new store_1.Store();
+    store.set("EMPTY", "empty markup");
+    (0, vitest_1.expect)(store.emptyMarkup).toEqual("empty markup");
+});

package/dist/esm/index.js

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

package/dist/esm/markupFetcher.js

@@ -1,6 +1,6 @@
 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, store = new Store()) {
     const fetchBatchMarkup = batchMarkupFetcherImpl(platform, fetchImplementation);

package/dist/esm/store.js

@@ -1,4 +1,4 @@
-class Store {
+export class Store {
     store;
     constructor() {
         globalThis.jamCommentsStore =
@@ -6,10 +6,10 @@ class Store {
         this.store = globalThis.jamCommentsStore;
     }
     set(path, markup) {
-        this.store.set(path, markup);
+        this.store.set(this.#normalizePath(path), markup);
     }
     get(path) {
-        return this.store.get(path) || null;
+        return this.store.get(this.#normalizePath(path)) || null;
     }
     clear() {
         this.store.clear();
@@ -20,5 +20,14 @@ class Store {
     get emptyMarkup() {
         return this.store.get("EMPTY") || null;
     }
+    #normalizePath(path) {
+        if (path === "EMPTY") {
+            return path;
+        }
+        let withLeadingSlash = path.startsWith("/") ? path : `/${path}`;
+        let withNoTrailingSlash = withLeadingSlash.endsWith("/")
+            ? withLeadingSlash.slice(0, -1)
+            : withLeadingSlash;
+        return withNoTrailingSlash.toLowerCase();
+    }
 }
-export default Store;

package/dist/esm/store.test.js

@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import { Store } from "./store";
+describe("paths", () => {
+    it("cleans path when setting markup", () => {
+        const store = new Store();
+        store.set("/path", "markup");
+        expect(store.get("/path")).toEqual("markup");
+        expect(store.get("path")).toEqual("markup");
+        expect(store.get("path/")).toEqual("markup");
+    });
+    it("cleans path with mixed casing", () => {
+        const store = new Store();
+        store.set("/Path", "markup");
+        expect(store.get("/path")).toEqual("markup");
+        expect(store.get("path")).toEqual("markup");
+        expect(store.get("path/")).toEqual("markup");
+    });
+    it("works just fine with deep paths", () => {
+        const store = new Store();
+        store.set("/path/to/deep", "markup");
+        expect(store.get("/path/to/deep")).toEqual("markup");
+        expect(store.get("path/to/deep")).toEqual("markup");
+        expect(store.get("path/to/deep/")).toEqual("markup");
+    });
+});
+it("retrieves EMPTY markup", () => {
+    const store = new Store();
+    store.set("EMPTY", "empty markup");
+    expect(store.emptyMarkup).toEqual("empty markup");
+});

package/dist/types/index.d.ts

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

package/dist/types/markupFetcher.d.ts

@@ -1,4 +1,4 @@
-import Store from "./store";
+import { Store } from "./store";
 export interface CustomCopy {
     confirmationMessage?: string;
     submitButton?: string;

package/dist/types/store.d.ts

@@ -1,4 +1,5 @@
-declare class Store {
+export declare class Store {
+    #private;
     store: Map<string, string>;
     constructor();
     set(path: string, markup: string): void;
@@ -7,4 +8,3 @@ declare class Store {
     get hasData(): boolean;
     get emptyMarkup(): string | null;
 }
-export default Store;

package/dist/types/store.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jam-comments/server-utilities",
-  "version": "5.10.0",
+  "version": "5.10.2",
   "description": "Various JavaScript utilities for JamComments.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -22,11 +22,11 @@
   "homepage": "https://jamcomments.com",
   "license": "GPL-2.0",
   "devDependencies": {
-    "@types/node": "^22.5.1",
+    "@types/node": "^22.9.0",
     "prettier": "^3.3.3",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2",
-    "vitest": "^2.0.5"
+    "typescript": "^5.6.3",
+    "vite": "^5.4.11",
+    "vitest": "^2.1.5"
   },
   "publishConfig": {
     "access": "public"