jest-webextension-mock 3.8.12 → 3.8.14

package/.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

package/.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "restricted",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# jest-webextension-mock
+
+## 3.8.14
+
+### Patch Changes
+
+- Fix different storage types using the same store
+
+## 3.8.13
+
+### Patch Changes
+
+- 2800518: Add storage onChange event listeners

package/__tests__/storage.test.js

@@ -143,6 +143,26 @@ describe('browser.storage', () => {
           });
         });
       });
+      test('onChanged', () => {
+        const callback = jest.fn();
+        expect(jest.isMockFunction(storage.onChanged.addListener)).toBe(true);
+        expect(jest.isMockFunction(storage.onChanged.removeListener)).toBe(
+          true
+        );
+        expect(jest.isMockFunction(storage.onChanged.hasListener)).toBe(true);
+        expect(jest.isMockFunction(storage.onChanged.hasListeners)).toBe(true);
+
+        expect(storage.onChanged.hasListeners()).toBe(false);
+        expect(storage.onChanged.hasListener(callback)).toBe(false);
+
+        storage.onChanged.addListener(callback);
+        expect(storage.onChanged.hasListeners()).toBe(true);
+        expect(storage.onChanged.hasListener(callback)).toBe(true);
+
+        storage.onChanged.removeListener(callback);
+        expect(storage.onChanged.hasListeners()).toBe(false);
+        expect(storage.onChanged.hasListener(callback)).toBe(false);
+      });
     });
   });
 });

package/dist/setup.js

@@ -239,6 +239,26 @@ var tabs = {
   })
 };
 
+var createEventListeners = function createEventListeners() {
+  var listeners = [];
+  return {
+    addListener: jest.fn(function (listener) {
+      listeners.push(listener);
+    }),
+    removeListener: jest.fn(function (listener) {
+      listeners = listeners.filter(function (l) {
+        return l !== listener;
+      });
+    }),
+    hasListener: jest.fn(function (listener) {
+      return listeners.includes(listener);
+    }),
+    hasListeners: jest.fn(function () {
+      return listeners.length > 0;
+    })
+  };
+};
+
 var store = {};
 function resolveKey(key) {
   if (typeof key === 'string') {
@@ -298,7 +318,8 @@ var storage = {
         return cb();
       }
       return Promise.resolve();
-    })
+    }),
+    onChanged: createEventListeners()
   },
   local: {
     get: jest.fn(function (id, cb) {
@@ -339,7 +360,8 @@ var storage = {
         return cb();
       }
       return Promise.resolve();
-    })
+    }),
+    onChanged: createEventListeners()
   },
   managed: {
     get: jest.fn(function (id, cb) {
@@ -380,13 +402,10 @@ var storage = {
         return cb();
       }
       return Promise.resolve();
-    })
+    }),
+    onChanged: createEventListeners()
   },
-  onChanged: {
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-    hasListener: jest.fn()
-  }
+  onChanged: createEventListeners()
 };
 
 var getDetails = function getDetails(details, cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-webextension-mock",
-  "version": "3.8.12",
+  "version": "3.8.14",
   "description": "Mock the components of a WebExtension",
   "main": "dist/setup.js",
   "module": "src/setup.js",
@@ -13,16 +13,16 @@
   "scripts": {
     "test": "jest",
     "build": "rollup -c",
-    "release": "bumpp && npm publish",
+    "release": "changeset version",
     "prettier": "prettier --write \"{config,src,__{tests,setups}__}/**/*.js\" rollup.config.js",
     "eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@babel/preset-env": "^7.11.5",
+    "@changesets/cli": "^2.27.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^26.5.2",
-    "bumpp": "^9.4.0",
     "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.12.0",
     "eslint-plugin-prettier": "^3.1.4",

package/src/createEventListeners.js

@@ -0,0 +1,18 @@
+export const createEventListeners = () => {
+  let listeners = [];
+
+  return {
+    addListener: jest.fn((listener) => {
+      listeners.push(listener);
+    }),
+    removeListener: jest.fn((listener) => {
+      listeners = listeners.filter((l) => l !== listener);
+    }),
+    hasListener: jest.fn((listener) => {
+      return listeners.includes(listener);
+    }),
+    hasListeners: jest.fn(() => {
+      return listeners.length > 0;
+    }),
+  };
+};

package/src/storage.js

@@ -1,6 +1,10 @@
-let store = {};
+import { createEventListeners } from './createEventListeners';
 
-function resolveKey(key) {
+let syncStore = {};
+let localStore = {};
+let managedStore = {};
+
+function resolveKey(key, store) {
   if (typeof key === 'string') {
     const result = {};
     result[key] = store[key];
@@ -22,7 +26,7 @@ function resolveKey(key) {
 export const storage = {
   sync: {
     get: jest.fn((id, cb) => {
-      const result = id === null ? store : resolveKey(id);
+      const result = id === null ? syncStore : resolveKey(id, syncStore);
       if (cb !== undefined) {
         return cb(result);
       }
@@ -35,7 +39,7 @@ export const storage = {
       return Promise.resolve(0);
     }),
     set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (store[key] = payload[key]));
+      Object.keys(payload).forEach((key) => (syncStore[key] = payload[key]));
       if (cb !== undefined) {
         return cb();
       }
@@ -43,23 +47,24 @@ export const storage = {
     }),
     remove: jest.fn((id, cb) => {
       const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete store[key]);
+      keys.forEach((key) => delete syncStore[key]);
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
     clear: jest.fn((cb) => {
-      store = {};
+      syncStore = {};
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
+    onChanged: createEventListeners(),
   },
   local: {
     get: jest.fn((id, cb) => {
-      const result = id === null ? store : resolveKey(id);
+      const result = id === null ? localStore : resolveKey(id, localStore);
       if (cb !== undefined) {
         return cb(result);
       }
@@ -72,7 +77,7 @@ export const storage = {
       return Promise.resolve(0);
     }),
     set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (store[key] = payload[key]));
+      Object.keys(payload).forEach((key) => (localStore[key] = payload[key]));
       if (cb !== undefined) {
         return cb();
       }
@@ -80,23 +85,24 @@ export const storage = {
     }),
     remove: jest.fn((id, cb) => {
       const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete store[key]);
+      keys.forEach((key) => delete localStore[key]);
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
     clear: jest.fn((cb) => {
-      store = {};
+      localStore = {};
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
+    onChanged: createEventListeners(),
   },
   managed: {
     get: jest.fn((id, cb) => {
-      const result = id === null ? store : resolveKey(id);
+      const result = id === null ? managedStore : resolveKey(id, managedStore);
       if (cb !== undefined) {
         return cb(result);
       }
@@ -109,7 +115,7 @@ export const storage = {
       return Promise.resolve(0);
     }),
     set: jest.fn((payload, cb) => {
-      Object.keys(payload).forEach((key) => (store[key] = payload[key]));
+      Object.keys(payload).forEach((key) => (managedStore[key] = payload[key]));
       if (cb !== undefined) {
         return cb();
       }
@@ -117,23 +123,20 @@ export const storage = {
     }),
     remove: jest.fn((id, cb) => {
       const keys = typeof id === 'string' ? [id] : id;
-      keys.forEach((key) => delete store[key]);
+      keys.forEach((key) => delete managedStore[key]);
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
     clear: jest.fn((cb) => {
-      store = {};
+      managedStore = {};
       if (cb !== undefined) {
         return cb();
       }
       return Promise.resolve();
     }),
+    onChanged: createEventListeners(),
   },
-  onChanged: {
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-    hasListener: jest.fn(),
-  },
+  onChanged: createEventListeners(),
 };