Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions packages/pinia-orm/src/cache/WeakCache.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
interface ValueRef<V extends object> {
deref(): V | undefined
}

/**
* Fallback for environments without WeakRef support (e.g. Cloudflare
* Workers). Values are held strongly instead of crashing.
*/
class StrongRef<V extends object> implements ValueRef<V> {
#value: V

constructor (value: V) {
this.#value = value
}

deref (): V {
return this.#value
}
}

export class WeakCache<K, V extends object> implements Map<K, V> {
// @ts-expect-error dont know
readonly [Symbol.toStringTag]: string

#map = new Map<K, WeakRef<V>>()
#map = new Map<K, ValueRef<V>>()

has (key: K) {
return !!(this.#map.has(key) && this.#map.get(key)?.deref())
Expand All @@ -25,7 +45,7 @@ export class WeakCache<K, V extends object> implements Map<K, V> {
}

set (key: K, value: V) {
this.#map.set(key, new WeakRef<V>(value))
this.#map.set(key, typeof WeakRef === 'undefined' ? new StrongRef<V>(value) : new WeakRef<V>(value))
return this
}

Expand Down
15 changes: 14 additions & 1 deletion packages/pinia-orm/tests/unit/cache/Weakcache.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, expect, it } from 'vitest'
import { describe, expect, it, vi } from 'vitest'

import { WeakCache } from '../../../src/cache/WeakCache'

Expand Down Expand Up @@ -72,4 +72,17 @@ describe('unit/support/Weakcache', () => {
cache.clear()
expect(cache.size).toEqual(0)
})

it('falls back to strong references when WeakRef is not available', () => {
vi.stubGlobal('WeakRef', undefined)

const fallbackCache = new WeakCache()
fallbackCache.set('key1', data)

expect(fallbackCache.get('key1')).toEqual(data)
expect(fallbackCache.has('key1')).toBeTruthy()
expect([...fallbackCache.values()]).toEqual([data])

vi.unstubAllGlobals()
})
})
Loading