Switch to p-memoize

Author: SamyPesse

bun.lock

@@ -142,8 +142,8 @@
         "@gitbook/cache-tags": "workspace:*",
         "@sindresorhus/fnv1a": "^3.1.0",
         "jwt-decode": "^4.0.0",
-        "memoizee": "^0.4.17",
         "next": "canary",
+        "p-memoize": "^7.1.1",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "rison": "^0.1.1",
@@ -2281,7 +2281,7 @@
 
     "mime-types": ["[email protected]", "", { "dependencies": { "mime-db": "^1.53.0" } }, "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="],
 
-    "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
+    "mimic-fn": ["mimic-fn@4.0.0", "", {}, "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="],
 
     "mimic-response": ["[email protected]", "", {}, "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="],
 
@@ -2393,6 +2393,8 @@
 
     "p-map": ["[email protected]", "", {}, "sha512-z4cYYMMdKHzw4O5UkWJImbZynVIo0lSGTXc7bzB1e/rrDqkgGUNysK/o4bTr+0+xKvvLoTyGqYC4Fgljy9qe1Q=="],
 
+    "p-memoize": ["[email protected]", "", { "dependencies": { "mimic-fn": "^4.0.0", "type-fest": "^3.0.0" } }, "sha512-DZ/bONJILHkQ721hSr/E9wMz5Am/OTJ9P6LhLFo2Tu+jL8044tgc9LwHO8g4PiaYePnlVVRAJcKmgy8J9MVFrA=="],
+
     "p-try": ["[email protected]", "", {}, "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="],
 
     "package-json": ["[email protected]", "", { "dependencies": { "got": "^9.6.0", "registry-auth-token": "^4.0.0", "registry-url": "^5.0.0", "semver": "^6.2.0" } }, "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="],
@@ -2803,7 +2805,7 @@
 
     "type": ["[email protected]", "", {}, "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ=="],
 
-    "type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="],
+    "type-fest": ["type-fest@3.13.1", "", {}, "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="],
 
     "type-is": ["[email protected]", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw=="],
 
@@ -4043,6 +4045,8 @@
 
     "mdast-util-gfm-task-list-item/mdast-util-to-markdown": ["[email protected]", "", { "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", "longest-streak": "^3.0.0", "mdast-util-phrasing": "^4.0.0", "mdast-util-to-string": "^4.0.0", "micromark-util-decode-string": "^2.0.0", "unist-util-visit": "^5.0.0", "zwitch": "^2.0.0" } }, "sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ=="],
 
+    "meow/type-fest": ["[email protected]", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="],
+
     "micro/arg": ["[email protected]", "", {}, "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg=="],
 
     "micro/content-type": ["[email protected]", "", {}, "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="],
@@ -4071,6 +4075,8 @@
 
     "normalize-package-data/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver" } }, "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="],
 
+    "onetime/mimic-fn": ["[email protected]", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
+
     "p-filter/p-map": ["[email protected]", "", {}, "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="],
 
     "package-json/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],

packages/gitbook-v2/package.json

@@ -13,7 +13,7 @@
         "warn-once": "^0.1.1",
         "rison": "^0.1.1",
         "jwt-decode": "^4.0.0",
-        "memoizee": "^0.4.17"
+        "p-memoize": "^7.1.1"
     },
     "devDependencies": {
         "gitbook": "*",

packages/gitbook-v2/src/lib/data/memoize.test.ts

@@ -2,36 +2,32 @@ import { describe, expect, it, mock } from 'bun:test';
 import { memoize } from './memoize';
 
 describe('memoize', () => {
-    it('should memoize the function', () => {
-        const fn = mock(() => Math.random());
+    it('should memoize the function', async () => {
+        const fn = mock(async () => Math.random());
         const memoized = memoize(fn);
-        expect(memoized()).toBe(memoized());
+        expect(await memoized()).toBe(await memoized());
     });
 
-    it('should memoize the function with different arguments', () => {
-        const fn = mock((a: number, b: number) => a + b);
+    it('should memoize the function with different arguments', async () => {
+        const fn = mock(async (a: number, b: number) => a + b);
         const memoized = memoize(fn);
-        expect(memoized(1, 2)).toBe(memoized(1, 2));
+        expect(await memoized(1, 2)).toBe(await memoized(1, 2));
         expect(fn.mock.calls.length).toBe(1);
-        expect(memoized(1, 2)).not.toBe(memoized(2, 3));
+        expect(await memoized(1, 2)).not.toBe(await memoized(2, 3));
         expect(fn.mock.calls.length).toBe(2);
     });
 
-    it('should memoize a function complex object', () => {
-        const fn = mock((a: { foo: string; bar: number }) => a.foo + a.bar);
+    it('should memoize a function complex object', async () => {
+        const fn = mock(async (a: { foo: string; bar: number }) => a.foo + a.bar);
         const memoized = memoize(fn);
-        expect(memoized({ foo: 'foo', bar: 1 })).toBe(memoized({ foo: 'foo', bar: 1 }));
+        expect(await memoized({ foo: 'foo', bar: 1 })).toBe(await memoized({ foo: 'foo', bar: 1 }));
         expect(fn.mock.calls.length).toBe(1);
-        expect(memoized({ foo: 'foo', bar: 1 })).not.toBe(memoized({ foo: 'foo', bar: 2 }));
+        expect(await memoized({ foo: 'foo', bar: 1 })).not.toBe(
+            await memoized({ foo: 'foo', bar: 2 })
+        );
         expect(fn.mock.calls.length).toBe(2);
     });
 
-    it('should support async function', async () => {
-        const fn = mock(async () => Math.random());
-        const memoized = memoize(fn);
-        expect(await memoized()).toBe(await memoized());
-    });
-
     it('should wrap concurrent async calls', async () => {
         const fn = mock(async () => Math.random());
         const memoized = memoize(fn);

packages/gitbook-v2/src/lib/data/memoize.ts

@@ -1,8 +1,8 @@
-import memoizee from 'memoizee';
+import pMemoize from 'p-memoize';
 
 export function memoize<F extends (...args: any[]) => any>(f: F): F {
-    return memoizee(f, {
-        normalizer: (args) => {
+    return pMemoize(f, {
+        cacheKey: (args) => {
             return JSON.stringify(deepSortValue(args));
         },
     });