upgraded tests

Author: pelikhan

packages/core/src/cache.test.ts

@@ -72,5 +72,19 @@ for (const type of ["memory", "jsonl", "fs"]) {
             const cachedValue = await cache.get("newKey")
             assert.strictEqual(cachedValue, 99)
         })
+
+        test("values() retrieves all stored values", async () => {
+            const cache = createCache<string, number>("testCache", {
+                type: type as any,
+            })
+            await cache.set("key1", 10)
+            await cache.set("key2", 20)
+            await cache.set("key3", 30)
+
+            const values = await cache.values()
+            assert(values.includes(10))
+            assert(values.includes(20))
+            assert(values.includes(30))
+        })
     })
 }

packages/core/src/constants.ts

@@ -335,6 +335,7 @@ export const TEMPLATE_ARG_DATA_SLICE_SAMPLE = 2000
 
 export const CHAT_REQUEST_PER_MODEL_CONCURRENT_LIMIT = 8
 export const PROMISE_QUEUE_CONCURRENCY_DEFAULT = 16
+export const FILE_READ_CONCURRENCY_DEFAULT = 16
 
 export const GITHUB_REST_API_CONCURRENCY_LIMIT = 8
 export const GITHUB_REST_PAGE_DEFAULT = 10

packages/core/src/fscache.ts

@@ -7,8 +7,13 @@ import debug, { Debugger } from "debug"
 import { errorMessage } from "./error"
 import { tryReadJSON } from "./fs"
 import { rm, readdir } from "fs/promises"
-import { CACHE_FORMAT_VERSION, CACHE_SHA_LENGTH } from "./constants"
+import {
+    CACHE_FORMAT_VERSION,
+    CACHE_SHA_LENGTH,
+    FILE_READ_CONCURRENCY_DEFAULT,
+} from "./constants"
 import { hash } from "./crypto"
+import pLimit from "p-limit"
 
 /**
  * A cache class stores each entry as a separate file in a directory.
@@ -54,10 +59,15 @@ export class FsCache<K, V> implements WorkspaceFileCache<any, any> {
     }
     async values(): Promise<any[]> {
         try {
+            const dir = this.folder()
             const files = await readdir(this.folder())
-            return files
-                .filter((f) => /\.json$/.test(f))
-                .map((f) => basename(f).replace(/\.json$/, ""))
+            const limit = pLimit(FILE_READ_CONCURRENCY_DEFAULT)
+            return await Promise.all(
+                files
+                    .filter((f) => /\.json$/.test(f))
+                    .map((f) => limit(() => tryReadJSON(join(dir, f))))
+                    .filter((f) => f !== undefined)
+            )
         } catch (e) {
             this.dbg(
                 `error while reading directory ${this.folder()}: ${errorMessage(e)}`

packages/sample/genaisrc/cache.genai.mts

@@ -10,13 +10,16 @@ for (const cache of [
     await workspace.cache<number, number>("test-cache"),
     await host.cache<number, number>("test-cache"),
 ]) {
+    console.log(`cache test ${cache.name}`)
     await cache.set(key, value)
     const result = await cache.get(key)
     if (result !== value) throw new Error(`unexpected value: ${result}`)
 
     const values = await cache.values()
     if (!values.includes(value)) {
-        throw new Error(`unexpected values: ${values}`)
+        throw new Error(
+            `unexpected values: ${values.join("\n")} in ${cache.name}`
+        )
     }
 }