Merge pull request #335 from nellh/memoize-fixes

fix: Add memoize resolver option and default to serialization of all arguments

Author: effigies

changelog.d/20260113_101504_nell_memoize_fixes.md

@@ -0,0 +1,47 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Added
+
+- A bullet item for the Added category.
+
+-->
+<!--
+### Changed
+
+- A bullet item for the Changed category.
+
+-->
+### Fixed
+
+- Fix memoization memory leak for readRemotes.
+
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->
+<!--
+### Infrastructure
+
+- A bullet item for the Infrastructure category.
+
+-->

src/files/repo.ts

@@ -157,7 +157,7 @@ async function _readRemotes(options: any): Promise<Record<string, Record<string,
   return byUUID
 }
 
-const readRemotes = memoize(_readRemotes)
+const readRemotes = memoize(_readRemotes, (options) => options?.gitdir)
 
 export async function parseAnnexedFile(
   path: string,

src/schema/datatypes.ts

@@ -14,7 +14,7 @@ function _modalityTable(schema: Schema): Record<string, string> {
 }
 
 // Construct once per schema; should only be multiple in tests
-export const modalityTable = memoize(_modalityTable)
+export const modalityTable = memoize(_modalityTable, (schema) => schema)
 
 export function findDatatype(
   file: BIDSFile,

src/utils/memoize.ts

@@ -1,15 +1,17 @@
-export type WithCache<T> = T & { cache: Map<string, any> }
+export type WithCache<T> = T & { cache: Map<any, any> }
 interface FileLike {
   path: string
   parent: { path: string }
 }
 
 export const memoize = <T>(
   fn: (...args: any[]) => T,
+  resolver?: (...args: any[]) => any,
 ): WithCache<(...args: any[]) => T> => {
   const cache = new Map()
-  const cached = function (this: any, val: T) {
-    return cache.has(val) ? cache.get(val) : cache.set(val, fn.call(this, val)) && cache.get(val)
+  const cached = function (this: any, ...args: any[]) {
+    const key = resolver ? resolver(...args) : JSON.stringify(args)
+    return cache.has(key) ? cache.get(key) : cache.set(key, fn.apply(this, args)) && cache.get(key)
   }
   cached.cache = cache
   return cached