Skip to content

Commit 8913b86

Browse files
committed
fix(typescript): add support to typescript 5.3
Replace winston in favour of simple logging implementation Update some dependencies
1 parent c6286e0 commit 8913b86

File tree

117 files changed

+2743
-1841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2743
-1841
lines changed

package-lock.json

Lines changed: 2096 additions & 1188 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"ts-check:src": "tsc --noEmit",
3434
"eslint": "eslint ./src/**/*.ts ./test/**/*.ts",
3535
"eslint:fix": "eslint --fix ./src/**/*.ts ./test/**/*.ts",
36-
"prettier": "node node_modules/prettier/bin-prettier.js --check **/*.{ts,json}",
36+
"prettier": "prettier --check **/*.{ts,json}",
3737
"prettier:fix": "npm run prettier -- --write",
3838
"release": "npm run dist:collect && semantic-release",
3939
"postversion": "cp -r package.json ../ && cp -r package-lock.json ../",
@@ -61,47 +61,46 @@
6161
"@semantic-release/changelog": "6.0.1",
6262
"@semantic-release/git": "10.0.1",
6363
"@semantic-release/github": "8.0.6",
64-
"@types/jasmine": "4.3.0",
64+
"@types/jasmine": "^5.1.4",
6565
"@types/lodash-es": "4.17.7",
6666
"@types/micromatch": "4.0.2",
6767
"@types/node": "16.18.31",
68-
"@typescript-eslint/eslint-plugin": "5.35.1",
69-
"@typescript-eslint/parser": "5.59.6",
68+
"@typescript-eslint/eslint-plugin": "^6.15.0",
69+
"@typescript-eslint/parser": "^6.15.0",
7070
"all-contributors-cli": "6.20.0",
7171
"clean-webpack-plugin": "4.0.0",
7272
"commitizen": "4.2.5",
7373
"conventional-changelog-angular": "5.0.13",
7474
"cross-env": "7.0.3",
7575
"cross-var": "1.1.0",
7676
"cz-customizable": "6.9.2",
77-
"eslint": "8.22.0",
78-
"eslint-config-prettier": "8.8.0",
77+
"eslint": "^8.56.0",
78+
"eslint-config-prettier": "^9.1.0",
7979
"eslint-plugin-import": "2.26.0",
80-
"eslint-plugin-prettier": "4.2.1",
81-
"eslint-webpack-plugin": "3.2.0",
80+
"eslint-plugin-prettier": "^5.1.2",
81+
"eslint-webpack-plugin": "^4.0.1",
8282
"git-branch-is": "4.0.0",
8383
"husky": "8.0.1",
84-
"jasmine": "4.3.0",
84+
"jasmine": "^5.1.0",
8585
"jasmine-spec-reporter": "7.0.0",
8686
"no-emit-webpack-plugin": "4.0.1",
87-
"prettier": "2.8.8",
87+
"prettier": "^3.1.1",
8888
"regenerator-runtime": "0.13.11",
8989
"semantic-release": "19.0.5",
9090
"semantic-release-slack-bot": "3.5.3",
91-
"ts-loader": "9.3.1",
92-
"ts-node": "10.9.1",
93-
"ts-patch": "^3.0.0-beta3",
91+
"ts-loader": "^9.5.1",
92+
"ts-node": "^10.9.2",
93+
"ts-patch": "^3.1.1",
9494
"tsconfig-paths": "4.2.0",
95-
"typescript": "^5.0.4",
95+
"typescript": "^5.3.3",
9696
"webpack": "5.76.1",
9797
"webpack-cli": "4.10.0",
9898
"webpack-merge": "5.8.0",
9999
"webpack-node-externals": "3.0.0"
100100
},
101101
"dependencies": {
102102
"lodash-es": "4.17.21",
103-
"micromatch": "4.0.5",
104-
"winston": "3.7.2"
103+
"micromatch": "4.0.5"
105104
},
106105
"peerDependencies": {
107106
"typescript": "^5.0.4"

src/create-hydrated-mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { NoTransformerError } from './errors/no-transformer.error';
33
import { PartialDeep } from './partial/partial';
44

55
export function createHydratedMock<T extends object>(
6-
_values?: PartialDeep<T>
6+
_values?: PartialDeep<T>,
77
): T {
88
throw new Error(NoTransformerError);
99
}

src/create-mock-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export function createMockList<T extends object>(
55
// eslint-disable-next-line @typescript-eslint/no-unused-vars
66
quantity: number,
77
// eslint-disable-next-line @typescript-eslint/no-unused-vars
8-
iterator?: (index: number) => PartialDeep<T>
8+
iterator?: (index: number) => PartialDeep<T>,
99
): T[] {
1010
throw new Error(NoTransformerError);
1111
}

src/extension/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export type Extension<TMock, TRequestedOverriddenMock> = (
2-
mock: TMock
2+
mock: TMock,
33
) => TRequestedOverriddenMock;

src/extension/extensionHandler.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { isFunction } from './method/function';
44
type AsMockedPropertyHandler<
55
TMockedPropertyHandler,
66
TMock,
7-
TPropName extends keyof TMock
7+
TPropName extends keyof TMock,
88
> = (
99
prop: TMock[TPropName],
1010
mock: TMock,
11-
propName: TPropName
11+
propName: TPropName,
1212
) => TMockedPropertyHandler;
1313

1414
export class ExtensionHandler<TMock> {
@@ -24,10 +24,10 @@ export class ExtensionHandler<TMock> {
2424
TMockedPropertyHandler,
2525
TMock,
2626
TPropName
27-
>
27+
>,
2828
): TMockedPropertyHandler;
2929
public get<TMockedPropertyHandler>(
30-
extension: Extension<TMock, TMockedPropertyHandler>
30+
extension: Extension<TMock, TMockedPropertyHandler>,
3131
): TMockedPropertyHandler;
3232
public get<TPropName extends keyof TMock, TMockedPropertyHandler>(
3333
extensionOrPropertyName:
@@ -37,7 +37,7 @@ export class ExtensionHandler<TMock> {
3737
TMockedPropertyHandler,
3838
TMock,
3939
TPropName
40-
>
40+
>,
4141
): TMockedPropertyHandler {
4242
if (isFunction(extensionOrPropertyName)) {
4343
return extensionOrPropertyName(this._mock);
@@ -47,14 +47,14 @@ export class ExtensionHandler<TMock> {
4747
throw new Error(
4848
`It looks like you are trying to get an extension for ${
4949
extensionOrPropertyName as string
50-
} without specifying the handler.`
50+
} without specifying the handler.`,
5151
);
5252
}
5353

5454
return maybePropertyHandler(
5555
this._mock[extensionOrPropertyName],
5656
this._mock,
57-
extensionOrPropertyName
57+
extensionOrPropertyName,
5858
);
5959
}
6060
}

src/extension/method/extensionMethod.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import { isString } from './string';
55
type FunctionReturn<TR> = () => TR;
66

77
export function method<TFunctionReturn, TMock>(
8-
target: keyof TMock
8+
target: keyof TMock,
99
): Extension<TMock, Method<TFunctionReturn>>;
1010

1111
export function method<TFunctionReturn, TMock>(
12-
cb: (mock: TMock) => FunctionReturn<TFunctionReturn> | Function
12+
cb: (mock: TMock) => FunctionReturn<TFunctionReturn> | Function,
1313
): Extension<TMock, Method<TFunctionReturn>>;
1414

1515
export function method<TFunctionReturn, TMock>(
1616
// eslint-disable-next-line @typescript-eslint/no-explicit-any
17-
cbOrTarget: any
17+
cbOrTarget: any,
1818
): Extension<TMock, Method<TFunctionReturn>> {
1919
if (isString(cbOrTarget)) {
2020
return (mock: TMock): Method<TFunctionReturn> =>

src/extension/method/function.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export function isFunction(
2-
functionToCheck: unknown
2+
functionToCheck: unknown,
33
): functionToCheck is Function {
44
return (
55
!!functionToCheck &&

src/extension/on/on.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export function On<U extends object>(mock: U): ExtensionHandler<U> {
66
// @ts-ignore
77
if (!mock[Marker.instance.get()]) {
88
throw new Error(
9-
'The provided mock is not valid. Please create a mock first with createMock'
9+
'The provided mock is not valid. Please create a mock first with createMock',
1010
);
1111
}
1212
return new ExtensionHandler(mock);

src/logger/consoleLogger.ts

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
import { Format, TransformableInfo } from 'logform';
2-
import * as winston from 'winston';
3-
import { ConsoleTransportInstance } from 'winston/lib/winston/transports';
1+
import { ILogger } from './logger.interface';
2+
import { MessageFormatter } from './logger';
43

5-
export function ConsoleLogger(): ConsoleTransportInstance {
6-
const customFormat: Format = winston.format.printf(
7-
(info: TransformableInfo) => `${info.level}: ${info.message}`
8-
);
9-
10-
return new winston.transports.Console({
11-
level: 'error',
12-
format: winston.format.combine(
13-
winston.format((info: TransformableInfo) => {
14-
info.level = info.level.toUpperCase();
15-
return info;
16-
})(),
17-
winston.format.colorize(),
18-
winston.format.simple(),
19-
customFormat
20-
),
21-
});
4+
/* eslint-disable no-console */
5+
export function ConsoleLogger(
6+
messageFormatter: MessageFormatter,
7+
service: string,
8+
): ILogger {
9+
return {
10+
info: (message: string): void => {
11+
console.log(messageFormatter(service, 'info', message));
12+
},
13+
warning: (message: string): void => {
14+
console.log(messageFormatter(service, 'warning', message));
15+
},
16+
error: (message: string): void => {
17+
console.log(messageFormatter(service, 'error', message));
18+
},
19+
};
2220
}
21+
/* eslint-enable no-console */

0 commit comments

Comments
 (0)