fix: support uppercase level and migreate code (#1)

Author: czy88840616

.github/workflows/benchmark.yml

@@ -9,23 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
-
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
-      rabbitmq:
-        image: rabbitmq:latest
-        ports:
-          - 5672/tcp
-        options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
+        node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
     - name: Git checkout
@@ -36,45 +20,27 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Start MongoDB
-      uses: supercharge/mongodb-github-action@1.6.0
-      with:
-        mongodb-version: 4.2
-
     - run: npm install && npm install codecov
-    - run: npm run bootstrap
     - run: npm run build --if-present
     - run: npm run lint
     - run: npm run cov
-      env:
-        RABBITMQ_URL: amqp://localhost:${{ job.services.rabbitmq.ports[5672] }}
-        ALI_SDK_OSS_REGION: ${{ secrets.ALI_SDK_OSS_REGION }}
-        ALI_SDK_OSS_ENDPOINT: ${{ secrets.ALI_SDK_OSS_ENDPOINT }}
-        ALI_SDK_OSS_ID: ${{ secrets.ALI_SDK_OSS_ID }}
-        ALI_SDK_OSS_SECRET: ${{ secrets.ALI_SDK_OSS_SECRET }}
-        ALI_SDK_OSS_BUCKET: ${{ secrets.ALI_SDK_OSS_BUCKET }}
-        ALI_SDK_STS_ID: ${{ secrets.ALI_SDK_STS_ID }}
-        ALI_SDK_STS_SECRET: ${{ secrets.ALI_SDK_STS_SECRET }}
-        ALI_SDK_STS_BUCKET: ${{ secrets.ALI_SDK_STS_BUCKET }}
-        ALI_SDK_STS_ROLE: ${{ secrets.ALI_SDK_STS_ROLE }}
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
 
-#
-#   build-windows:
-#     runs-on: windows-latest
-#
-#     strategy:
-#       matrix:
-#         node-version: [12.x, 14.x]
-#
-#     steps:
-#     - uses: actions/checkout@v2
-#     - name: Use Node.js ${{ matrix.node-version }}
-#       uses: actions/setup-node@v1
-#       with:
-#         node-version: ${{ matrix.node-version }}
-#     - run: npm install
-#     - run: npm run bootstrap
-#     - run: npm run build --if-present
-#     - run: npm run cov
+
+  # build-windows:
+  #   runs-on: windows-latest
+
+  #   strategy:
+  #     matrix:
+  #       node-version: [12.x, 14.x]
+
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v1
+  #     with:
+  #       node-version: ${{ matrix.node-version }}
+  #   - run: npm install
+  #   - run: npm run build --if-present
+  #   - run: npm run cov

.github/workflows/nodejs.yml

@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('mwts/.prettierrc.json')
+}

.prettierrc.js

@@ -15,6 +15,7 @@
     "@types/jest": "^27.0.0",
     "@types/node": "16.11.17",
     "colors": "^1.4.0",
+    "cross-env": "^6.0.3",
     "egg-logger": "^2.7.1",
     "fs-extra": "^8.1.0",
     "jest": "27.4.5",
@@ -28,16 +29,19 @@
   },
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "dist/**/*.js.map"
   ],
   "keywords": [
     "midway",
     "logger"
   ],
   "scripts": {
     "build": "rm -rf dist && tsc",
-    "test": "jest",
-    "cov": "jest --coverage --forceExit"
+    "test": "cross-env node --require=ts-node/register ./node_modules/.bin/jest",
+    "cov": "cross-env node --require=ts-node/register ./node_modules/.bin/jest --coverage --forceExit",
+    "lint": "mwts check",
+    "lint:fix": "mwts fix"
   },
   "repository": {
     "type": "git",

package.json

@@ -38,7 +38,7 @@ export interface IMidwayLogger extends ILogger {
   close(): any;
 }
 
-export type LoggerLevel = 'all' | 'silly' | 'debug' | 'info' | 'warn' | 'error' | 'none';
+export type LoggerLevel = 'all' | 'silly' | 'debug' | 'info' | 'warn' | 'error' | 'none' | 'ALL' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'NONE';
 
 export interface LoggerOptions {
   format?: logform.Format;

src/interface.ts

@@ -108,7 +108,7 @@ export class MidwayBaseLogger extends EmptyLogger implements IMidwayLogger {
     );
 
     this.consoleTransport = new transports.Console({
-      level: options.consoleLevel || options.level || 'silly',
+      level: (options.consoleLevel || options.level || 'silly').toLowerCase(),
       format: format.combine(
         process.env.MIDWAY_LOGGER_DISABLE_COLORS !== 'true'
           ? format.colorize({
@@ -193,8 +193,11 @@ export class MidwayBaseLogger extends EmptyLogger implements IMidwayLogger {
         dirname: this.loggerOptions.dir,
         filename: this.loggerOptions.fileLogName,
         datePattern: this.loggerOptions.fileDatePattern || 'YYYY-MM-DD',
-        level:
-          this.loggerOptions.fileLevel || this.loggerOptions.level || 'silly',
+        level: (
+          this.loggerOptions.fileLevel ||
+          this.loggerOptions.level ||
+          'silly'
+        ).toLowerCase(),
         createSymlink: this.loggerOptions.disableFileSymlink !== true,
         symlinkName: this.loggerOptions.fileLogName,
         maxSize: this.loggerOptions.fileMaxSize || '200m',
@@ -249,17 +252,17 @@ export class MidwayBaseLogger extends EmptyLogger implements IMidwayLogger {
   }
 
   updateLevel(level: LoggerLevel): void {
-    this.level = level;
+    this.level = level.toLowerCase();
     this.consoleTransport.level = level;
     this.fileTransport.level = level;
   }
 
   updateFileLevel(level: LoggerLevel): void {
-    this.fileTransport.level = level;
+    this.fileTransport.level = level.toLowerCase();
   }
 
   updateConsoleLevel(level: LoggerLevel): void {
-    this.consoleTransport.level = level;
+    this.consoleTransport.level = level.toLowerCase();
   }
 
   updateDefaultLabel(defaultLabel: string): void {