diff --git a/package-lock.json b/package-lock.json index 65201af..fd2119b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@types/prompts": "2.0.13", "chalk": "4.1.1", "cli-table": "0.3.6", - "consola": "2.15.0", + "consola": "3.2.3", "find": "0.3.0", "fs-extra": "10.0.0", "jwt-decode": "3.1.2", @@ -26,6 +26,7 @@ "@types/cli-table": "0.3.0", "@types/find": "0.2.1", "@types/jest": "29.4.0", + "@types/node": "20.4.9", "@types/rimraf": "3.0.1", "@types/valid-url": "1.0.3", "babel-jest": "29.4.3", @@ -34,7 +35,7 @@ "ts-jest": "29.0.5", "ts-loader": "9.2.6", "ts-node": "10.9.1", - "typescript": "4.5.4" + "typescript": "5.1.6" } }, "node_modules/@ampproject/remapping": { @@ -1280,9 +1281,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.12.tgz", - "integrity": "sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==" + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==" }, "node_modules/@types/prettier": { "version": "2.7.2", @@ -1964,9 +1965,12 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "node_modules/consola": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", - "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", + "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==", + "engines": { + "node": "^14.18.0 || >=16.10.0" + } }, "node_modules/convert-source-map": { "version": "1.9.0", @@ -4400,16 +4404,16 @@ } }, "node_modules/typescript": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz", - "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/universalify": { @@ -5701,9 +5705,9 @@ "dev": true }, "@types/node": { - "version": "17.0.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.12.tgz", - "integrity": "sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==" + "version": "20.4.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz", + "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==" }, "@types/prettier": { "version": "2.7.2", @@ -6257,9 +6261,9 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "consola": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", - "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", + "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==" }, "convert-source-map": { "version": "1.9.0", @@ -8052,9 +8056,9 @@ "dev": true }, "typescript": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz", - "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true }, "universalify": { diff --git a/package.json b/package.json index 247c883..b188611 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "@types/cli-table": "0.3.0", "@types/find": "0.2.1", "@types/jest": "29.4.0", + "@types/node": "20.4.9", "@types/rimraf": "3.0.1", "@types/valid-url": "1.0.3", "babel-jest": "29.4.3", @@ -48,7 +49,7 @@ "ts-jest": "29.0.5", "ts-loader": "9.2.6", "ts-node": "10.9.1", - "typescript": "4.5.4" + "typescript": "5.1.6" }, "dependencies": { "@fast-csv/format": "4.3.5", @@ -56,7 +57,7 @@ "@types/prompts": "2.0.13", "chalk": "4.1.1", "cli-table": "0.3.6", - "consola": "2.15.0", + "consola": "3.2.3", "find": "0.3.0", "fs-extra": "10.0.0", "jwt-decode": "3.1.2", diff --git a/src/logger/isLowerThanOrEqualTo.ts b/src/logger/isLowerThanOrEqualTo.ts index c02b05c..ab657eb 100644 --- a/src/logger/isLowerThanOrEqualTo.ts +++ b/src/logger/isLowerThanOrEqualTo.ts @@ -4,12 +4,10 @@ export const isLowerThanOrEqualTo = ( currentLevel: LogLevel, level: LogLevel ): boolean => { + // REFACTOR: use switch if (currentLevel === LogLevel.Off) return false - if (currentLevel === LogLevel.Debug) return true - if (currentLevel === LogLevel.Trace) return true - if (currentLevel === LogLevel.Info) { return ( level === LogLevel.Info || @@ -17,9 +15,9 @@ export const isLowerThanOrEqualTo = ( level === LogLevel.Error ) } - - if (currentLevel === LogLevel.Warn) + if (currentLevel === LogLevel.Warn) { return level === LogLevel.Warn || level === LogLevel.Error + } return level === LogLevel.Error } diff --git a/src/logger/logger.ts b/src/logger/logger.ts index 8d45533..b35140a 100644 --- a/src/logger/logger.ts +++ b/src/logger/logger.ts @@ -1,4 +1,4 @@ -import consola from 'consola' +import { consola } from 'consola' import { isLowerThanOrEqualTo } from './isLowerThanOrEqualTo' import { isNullOrUndefined } from './isNullOrUndefined' import { LogLevel } from './logLevel'