fix: 🐛 Fix assigning to widget object

mjancarik · Aug 9, 2023 · 6a89efa · 6a89efa
1 parent 2960ff2
commit 6a89efa
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 35 deletions.
diff --git a/packages/plugin-component/src/index.js b/packages/plugin-component/src/index.js
@@ -1,4 +1,4 @@
-import { setDefaultValueForUndefined } from '@merkur/core';
+import { assignMissingKeys, setDefaultValueForUndefined } from '@merkur/core';
 
 export function componentPlugin() {
   return {
@@ -29,11 +29,7 @@ export function componentPlugin() {
         suspendedTasks: [],
       };
 
-      widget = {
-        ...widgetProperties,
-        ...componentAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, componentAPI(), widgetProperties);
 
       widget = setDefaultValueForUndefined(widget, ['props', 'state']);
       widget = setDefaultValueForUndefined(widget, ['assets'], []);

diff --git a/packages/plugin-event-emitter/src/index.js b/packages/plugin-event-emitter/src/index.js
@@ -1,10 +1,9 @@
+import { assignMissingKeys } from '@merkur/core';
+
 export function eventEmitterPlugin() {
   return {
     async setup(widget) {
-      widget = {
-        ...eventEmitterAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, eventEmitterAPI());
 
       widget.$in.eventEmitter = {
         event: {},

diff --git a/packages/plugin-graphql-client/src/index.js b/packages/plugin-graphql-client/src/index.js
@@ -1,4 +1,4 @@
-import { bindWidgetToFunctions } from '@merkur/core';
+import { assignMissingKeys, bindWidgetToFunctions } from '@merkur/core';
 
 import { print, visit, stripIgnoredCharacters } from 'graphql';
 
@@ -30,10 +30,7 @@ function setEntityClasses(widget, entityClasses) {
 function graphqlClientPlugin() {
   return {
     async setup(widget) {
-      widget = {
-        ...graphqlClientAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, graphqlClientAPI());
 
       widget.$in.graphqlClient = {
         endpointUrl: '',

diff --git a/packages/plugin-http-cache/src/index.js b/packages/plugin-http-cache/src/index.js
@@ -1,4 +1,8 @@
-import { bindWidgetToFunctions, hookMethod } from '@merkur/core';
+import {
+  assignMissingKeys,
+  bindWidgetToFunctions,
+  hookMethod,
+} from '@merkur/core';
 import { setDefaultConfig, copyResponse } from '@merkur/plugin-http-client';
 
 import CacheEntry from './CacheEntry';
@@ -32,10 +36,7 @@ export function httpCachePlugin() {
         );
       }
 
-      widget = {
-        ...httpCacheAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, httpCacheAPI());
 
       widget.$in.httpClient.cache = new Map();
 

diff --git a/packages/plugin-http-client/src/index.js b/packages/plugin-http-client/src/index.js
@@ -1,4 +1,4 @@
-import { bindWidgetToFunctions } from '@merkur/core';
+import { assignMissingKeys, bindWidgetToFunctions } from '@merkur/core';
 
 export function setDefaultConfig(widget, newDefaultConfig) {
   widget.$in.httpClient.defaultConfig = {
@@ -17,10 +17,7 @@ export function getDefaultTransformers(widget) {
 export function httpClientPlugin() {
   return {
     async setup(widget) {
-      widget = {
-        ...httpClientAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, httpClientAPI());
 
       widget.$in.httpClient = {
         defaultConfig: {

diff --git a/packages/plugin-router/src/index.js b/packages/plugin-router/src/index.js
@@ -1,4 +1,5 @@
 import {
+  assignMissingKeys,
   bindWidgetToFunctions,
   setDefaultValueForUndefined,
   hookMethod,
@@ -27,10 +28,7 @@ export function createRouter(widget, routes, options) {
 export function routerPlugin() {
   return {
     async setup(widget) {
-      widget = {
-        ...routerAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, routerAPI());
 
       widget.$in.router = {
         route: null,

diff --git a/packages/plugin-session-storage/src/__tests__/indexSpec.js b/packages/plugin-session-storage/src/__tests__/indexSpec.js
@@ -177,7 +177,7 @@ describe('Session Storage plugin', () => {
     widget.$dependencies.sessionStorage.setItem.mockImplementationOnce(() => {
       throw new Error('setItem error');
     });
-    jest.spyOn(console, 'error').mockImplementationOnce();
+    jest.spyOn(console, 'error').mockImplementation();
 
     expect(console.error).not.toHaveBeenCalled();
 

diff --git a/packages/plugin-session-storage/src/index.js b/packages/plugin-session-storage/src/index.js
@@ -1,4 +1,4 @@
-import { bindWidgetToFunctions } from '@merkur/core';
+import { assignMissingKeys, bindWidgetToFunctions } from '@merkur/core';
 
 const KEY_PREFIX_SEPARATOR = '__';
 
@@ -18,10 +18,7 @@ export function setKeyPrefix(
 export function sessionStoragePlugin() {
   return {
     async setup(widget) {
-      widget = {
-        ...sessionStorageAPI(),
-        ...widget,
-      };
+      assignMissingKeys(widget, sessionStorageAPI());
 
       widget.$in.sessionStorage = {};
       setKeyPrefix(widget);