fix(storage): Error comparing storage instances for change listener

The old switch statement was starting to break, and couldn't consistently tell which storage was in use.

Instead, use the per-storage listeners and we don't have to worry about the storage name.

packages/storage/src/defineExtensionStorage.ts

@@ -15,22 +15,17 @@ interface RegisteredChangeListener<TSchema extends AnySchema> {
 export function defineExtensionStorage<TSchema extends AnySchema = AnySchema>(
  storage: Storage.StorageArea,
 ): ExtensionStorage<TSchema> {
- const area = getStorageName(storage);
-
  /**
  * The singleton callback added and removed from the `browser.storage.onChanged` event. It calls
  * all the listeners added to this storage instance.
  */
- const onStorageChanged = async (
- changes: Record<string, Storage.StorageChange>,
- changedArea: string,
- ) => {
- if (area !== changedArea) return;
-
+ const onStorageChanged = async (changes: browser.Storage.StorageAreaOnChangedChangesType) => {
  const work = listeners.map(({ key, cb }) => {
  if (!(key in changes)) return;
 
- const { newValue, oldValue } = changes[key as string];
+ const { newValue, oldValue } = changes[
+ key as string
+ ] as browser.Storage.StorageAreaOnChangedChangesType;
  if (newValue === oldValue) return;
 
  return cb(newValue, oldValue);
@@ -47,7 +42,7 @@ export function defineExtensionStorage<TSchema extends AnySchema = AnySchema>(
  */
  function addListener(listener: RegisteredChangeListener<TSchema>) {
  if (listeners.length === 0) {
- browser.storage.onChanged.addListener(onStorageChanged);
+ storage.onChanged.addListener(onStorageChanged);
  }
 
  listeners.push(listener);

packages/storage/src/index.test.ts

@@ -141,7 +141,7 @@ describe('Storage Wrappers', () => {
  describe('onChange', () => {
  it('should only add a single onChange listener using the browser.storage.onChanged API', async () => {
  const fn = vi.fn();
- const addListenerSpy = vi.spyOn(fakeBrowser.storage.onChanged, 'addListener');
+ const addListenerSpy = vi.spyOn(fakeBrowser.storage.local.onChanged, 'addListener');
 
  storage.onChange('key1', fn);
  expect(addListenerSpy).toBeCalledTimes(1);