Skip to content

Commit 7902db5

Browse files
committed
deps: removed lodash -> added lodash.x deps
1 parent 02f0eae commit 7902db5

File tree

7 files changed

+2184
-1747
lines changed

7 files changed

+2184
-1747
lines changed

Diff for: package-lock.json

+638-224
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"devDependencies": {
4646
"@types/aws-lambda": "^8.10.72",
4747
"@types/jest": "^27.0.0",
48-
"@types/lodash": "^4.14.168",
4948
"@types/node": "^17.0.0",
5049
"@typescript-eslint/eslint-plugin": "^5.5.0",
5150
"@typescript-eslint/parser": "^5.5.0",

Diff for: packages/logger/npm-shrinkwrap.json renamed to packages/logger/package-lock.json

+1,530-1,512
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/logger/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
"typedocMain": "src/index.ts",
4343
"devDependencies": {
4444
"@types/jest": "^27.0.0",
45-
"@types/lodash": "^4.14.168",
45+
"@types/lodash.clonedeep": "^4.5.6",
46+
"@types/lodash.merge": "^4.6.6",
47+
"@types/lodash.pickby": "^4.6.6",
4648
"@types/node": "^16.0.0",
4749
"@typescript-eslint/eslint-plugin": "^5.4.0",
4850
"@typescript-eslint/parser": "^5.4.0",
@@ -69,8 +71,8 @@
6971
"@aws-lambda-powertools/commons": "0.2.0",
7072
"@middy/core": "^2.5.3",
7173
"@types/aws-lambda": "^8.10.72",
72-
"lodash": "^4.17.21",
7374
"lodash.clonedeep": "^4.5.0",
74-
"lodash.merge": "^4.6.2"
75+
"lodash.merge": "^4.6.2",
76+
"lodash.pickby": "^4.6.0"
7577
}
76-
}
78+
}

Diff for: packages/logger/src/Logger.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import type { Context } from 'aws-lambda';
22
import { LogFormatterInterface, PowertoolLogFormatter } from './formatter';
33
import { LogItem } from './log';
4-
import { cloneDeep, merge } from 'lodash/fp';
4+
import cloneDeep from 'lodash.clonedeep';
5+
import merge from 'lodash.merge';
56
import { ConfigServiceInterface, EnvironmentVariablesService } from './config';
67
import type {
78
Environment,
@@ -69,7 +70,7 @@ class Logger implements ClassThatLogs {
6970
}
7071

7172
public addPersistentLogAttributes(attributes?: LogAttributes): void {
72-
this.persistentLogAttributes = merge(this.getPersistentLogAttributes(), attributes);
73+
this.persistentLogAttributes = merge(attributes, this.getPersistentLogAttributes());
7374
}
7475

7576
public appendKeys(attributes?: LogAttributes): void {
@@ -148,16 +149,16 @@ class Logger implements ClassThatLogs {
148149

149150
private addToPowertoolLogData(...attributesArray: Array<Partial<PowertoolLogData>>): void {
150151
attributesArray.forEach((attributes: Partial<PowertoolLogData>) => {
151-
this.powertoolLogData = merge(this.getPowertoolLogData(), attributes);
152+
this.powertoolLogData = merge(attributes, this.getPowertoolLogData());
152153
});
153154
}
154155

155156
private createAndPopulateLogItem(logLevel: LogLevel, input: LogItemMessage, extraInput: LogItemExtraInput): LogItem {
156-
const unformattedBaseAttributes = merge(this.getPowertoolLogData(), {
157+
const unformattedBaseAttributes = merge({
157158
logLevel,
158159
timestamp: new Date(),
159160
message: typeof input === 'string' ? input : input.message,
160-
});
161+
}, this.getPowertoolLogData());
161162

162163
const logItem = new LogItem({
163164
baseAttributes: this.getLogFormatter().formatAttributes(unformattedBaseAttributes),

Diff for: packages/logger/src/log/LogItem.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { pickBy, merge } from 'lodash';
1+
import pickBy from 'lodash.pickby';
2+
import merge from 'lodash.merge';
23
import { LogItemInterface } from '.';
34
import { LogAttributes } from '../types';
45

Diff for: packages/logger/tests/unit/Logger.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,8 @@ describe('Class: Logger', () => {
650650
class LambdaFunction implements LambdaInterface {
651651

652652
@logger.injectLambdaContext()
653+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
654+
// @ts-ignore
653655
public async handler<TEvent>(_event: TEvent, _context: Context): Promise<string> {
654656
logger.info('This is an INFO log with some context');
655657

0 commit comments

Comments
 (0)