Skip to content

Commit 4347bd3

Browse files
committed
fix: use Object.assign() instead of object spread
1 parent 1b01b25 commit 4347bd3

File tree

3 files changed

+41
-30
lines changed

3 files changed

+41
-30
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redux-logger",
3-
"version": "3.0.2",
3+
"version": "3.0.3",
44
"description": "Logger for Redux",
55
"main": "dist/redux-logger.js",
66
"module": "src/index.js",

src/core.js

+33-15
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ function getLogLevel(level, action, payload, type) {
2323
}
2424

2525
function defaultTitleFormatter(options) {
26-
const {
27-
timestamp,
28-
duration,
29-
} = options;
26+
const { timestamp, duration } = options;
3027

3128
return (action, time, took) => {
3229
const parts = ['action'];
@@ -64,7 +61,9 @@ function printBuffer(buffer, options) {
6461

6562
// Message
6663
const formattedAction = actionTransformer(action);
67-
const isCollapsed = (typeof collapsed === 'function') ? collapsed(() => nextState, action, logEntry) : collapsed;
64+
const isCollapsed = typeof collapsed === 'function'
65+
? collapsed(() => nextState, action, logEntry)
66+
: collapsed;
6867

6968
const formattedTime = formatTime(startedTime);
7069
const titleCSS = colors.title ? `color: ${colors.title(formattedAction)};` : '';
@@ -77,8 +76,7 @@ function printBuffer(buffer, options) {
7776
// Render
7877
try {
7978
if (isCollapsed) {
80-
if (colors.title && isUsingDefaultFormatter) logger.groupCollapsed(`%c ${title}`, ...headerCSS);
81-
else logger.groupCollapsed(title);
79+
if (colors.title && isUsingDefaultFormatter) { logger.groupCollapsed(`%c ${title}`, ...headerCSS); } else logger.groupCollapsed(title);
8280
} else if (colors.title && isUsingDefaultFormatter) {
8381
logger.group(`%c ${title}`, ...headerCSS);
8482
} else {
@@ -94,23 +92,43 @@ function printBuffer(buffer, options) {
9492
const nextStateLevel = getLogLevel(level, formattedAction, [nextState], 'nextState');
9593

9694
if (prevStateLevel) {
97-
if (colors.prevState) logger[prevStateLevel]('%c prev state', `color: ${colors.prevState(prevState)}; font-weight: bold`, prevState);
98-
else logger[prevStateLevel]('prev state', prevState);
95+
if (colors.prevState) {
96+
logger[prevStateLevel](
97+
'%c prev state',
98+
`color: ${colors.prevState(prevState)}; font-weight: bold`,
99+
prevState,
100+
);
101+
} else logger[prevStateLevel]('prev state', prevState);
99102
}
100103

101104
if (actionLevel) {
102-
if (colors.action) logger[actionLevel]('%c action ', `color: ${colors.action(formattedAction)}; font-weight: bold`, formattedAction);
103-
else logger[actionLevel]('action ', formattedAction);
105+
if (colors.action) {
106+
logger[actionLevel](
107+
'%c action ',
108+
`color: ${colors.action(formattedAction)}; font-weight: bold`,
109+
formattedAction,
110+
);
111+
} else logger[actionLevel]('action ', formattedAction);
104112
}
105113

106114
if (error && errorLevel) {
107-
if (colors.error) logger[errorLevel]('%c error ', `color: ${colors.error(error, prevState)}; font-weight: bold;`, error);
108-
else logger[errorLevel]('error ', error);
115+
if (colors.error) {
116+
logger[errorLevel](
117+
'%c error ',
118+
`color: ${colors.error(error, prevState)}; font-weight: bold;`,
119+
error,
120+
);
121+
} else logger[errorLevel]('error ', error);
109122
}
110123

111124
if (nextStateLevel) {
112-
if (colors.nextState) logger[nextStateLevel]('%c next state', `color: ${colors.nextState(nextState)}; font-weight: bold`, nextState);
113-
else logger[nextStateLevel]('next state', nextState);
125+
if (colors.nextState) {
126+
logger[nextStateLevel](
127+
'%c next state',
128+
`color: ${colors.nextState(nextState)}; font-weight: bold`,
129+
nextState,
130+
);
131+
} else logger[nextStateLevel]('next state', nextState);
114132
}
115133

116134
if (diff) {

src/index.js

+7-14
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ import defaults from './defaults';
2222
* @returns {function} logger middleware
2323
*/
2424
function createLogger(options = {}) {
25-
const loggerOptions = {
26-
...defaults,
27-
...options,
28-
};
25+
const loggerOptions = Object.assign({}, defaults, options);
2926

3027
const {
3128
logger,
@@ -96,11 +93,11 @@ const store = createStore(
9693
logEntry.took = timer.now() - logEntry.started;
9794
logEntry.nextState = stateTransformer(getState());
9895

99-
const diff = loggerOptions.diff && typeof diffPredicate === 'function' ?
100-
diffPredicate(getState, action) :
101-
loggerOptions.diff;
96+
const diff = loggerOptions.diff && typeof diffPredicate === 'function'
97+
? diffPredicate(getState, action)
98+
: loggerOptions.diff;
10299

103-
printBuffer(logBuffer, { ...loggerOptions, diff });
100+
printBuffer(logBuffer, Object.assign({}, loggerOptions, { diff }));
104101
logBuffer.length = 0;
105102

106103
if (logEntry.error) throw logEntry.error;
@@ -113,7 +110,7 @@ const defaultLogger = ({ dispatch, getState } = {}) => {
113110
if (typeof dispatch === 'function' || typeof getState === 'function') {
114111
return createLogger()({ dispatch, getState });
115112
}
116-
// eslint-disable-next-line no-console
113+
// eslint-disable-next-line no-console
117114
console.error(`
118115
[redux-logger v3] BREAKING CHANGE
119116
[redux-logger v3] Since 3.0.0 redux-logger exports by default logger with default settings.
@@ -124,10 +121,6 @@ const defaultLogger = ({ dispatch, getState } = {}) => {
124121
`);
125122
};
126123

127-
export {
128-
defaults,
129-
createLogger,
130-
defaultLogger as logger,
131-
};
124+
export { defaults, createLogger, defaultLogger as logger };
132125

133126
export default defaultLogger;

0 commit comments

Comments
 (0)