chore: Update prettier configuration

ThanatosGit · Aug 31, 2020 · 0de5a4e · 0de5a4e
1 parent 6a8e633
commit 0de5a4e
Show file tree

Hide file tree

Showing 438 changed files with 4,039 additions and 4,037 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,4 +1,6 @@
 {
   "printWidth": 140,
-  "bracketSpacing": false
+  "bracketSpacing": false,
+  "trailingComma": "none",
+  "arrowParens": "always"
 }
diff --git a/packages/ajv/src/pipes/AjvErrorFormatterPipe.ts b/packages/ajv/src/pipes/AjvErrorFormatterPipe.ts
@@ -17,7 +17,7 @@ function defaultFormatter(error: AjvErrorObject, index: string | number) {
       index !== undefined && error.modelName && isNaN(+index) && ".",
       `${error.modelName || ""}`,
       error.dataPath,
-      ` ${error.message}. Given value: ${value}`,
+      ` ${error.message}. Given value: ${value}`
     ]
       // @ts-ignore
       .filter<string>(Boolean)

diff --git a/packages/ajv/src/pipes/AjvValidationPipe.spec.ts b/packages/ajv/src/pipes/AjvValidationPipe.spec.ts
@@ -9,7 +9,7 @@ import {
   QueryParams,
   Required,
   UseParam,
-  ValidationError,
+  ValidationError
 } from "@tsed/common";
 import {expect} from "chai";
 import {AjvValidationPipe} from "./AjvValidationPipe";
@@ -32,8 +32,8 @@ describe("AjvValidationPipe", () => {
   beforeEach(() =>
     PlatformTest.create({
       ajv: {
-        verbose: true,
-      },
+        verbose: true
+      }
     })
   );
   afterEach(() => PlatformTest.reset());
@@ -66,14 +66,14 @@ describe("AjvValidationPipe", () => {
           keyword: "type",
           message: "should be object",
           params: {
-            type: "object",
+            type: "object"
           },
           parentSchema: {
-            type: "object",
+            type: "object"
           },
           schema: "object",
-          schemaPath: "#/type",
-        },
+          schemaPath: "#/type"
+        }
       ]);
     });
   });
@@ -121,7 +121,7 @@ describe("AjvValidationPipe", () => {
       }
 
       const value = {
-        id: "hello",
+        id: "hello"
       };
       const result = await validate(value, ParamMetadata.get(Ctrl, "get", 0));
 
@@ -153,25 +153,25 @@ describe("AjvValidationPipe", () => {
           message: "should have required property 'id'",
           modelName: "Model",
           params: {
-            missingProperty: "id",
+            missingProperty: "id"
           },
           parentSchema: {
             definitions: {},
             properties: {
               id: {
-                type: "string",
-              },
+                type: "string"
+              }
             },
             required: ["id"],
-            type: "object",
+            type: "object"
           },
           schema: {
             id: {
-              type: "string",
-            },
+              type: "string"
+            }
           },
-          schemaPath: "#/required",
-        },
+          schemaPath: "#/required"
+        }
       ]);
     });
     it("should throw an error (deep property)", async () => {
@@ -194,7 +194,7 @@ describe("AjvValidationPipe", () => {
 
       const value: any = {
         id: "id",
-        user: {},
+        user: {}
       };
 
       const error = await validate(value, ParamMetadata.get(Ctrl, "get", 0));
@@ -218,8 +218,8 @@ describe("AjvValidationPipe", () => {
 
       const value = [
         {
-          id: "hello",
-        },
+          id: "hello"
+        }
       ];
       const result = await validate(value, ParamMetadata.get(Ctrl, "get", 0));
 
@@ -265,8 +265,8 @@ describe("AjvValidationPipe", () => {
       const value: any = [
         {
           id: "id",
-          user: {},
-        },
+          user: {}
+        }
       ];
 
       const error = await validate(value, ParamMetadata.get(Ctrl, "get", 0));
@@ -290,8 +290,8 @@ describe("AjvValidationPipe", () => {
 
       const value = {
         key1: {
-          id: "hello",
-        },
+          id: "hello"
+        }
       };
       const result = await validate(value, ParamMetadata.get(Ctrl, "get", 0));
 
@@ -337,8 +337,8 @@ describe("AjvValidationPipe", () => {
       const value: any = {
         key1: {
           id: "id",
-          user: {},
-        },
+          user: {}
+        }
       };
 
       const error = await validate(value, ParamMetadata.get(Ctrl, "get", 0));

diff --git a/packages/ajv/src/pipes/AjvValidationPipe.ts b/packages/ajv/src/pipes/AjvValidationPipe.ts
@@ -66,7 +66,7 @@ export class AjvValidationPipe extends ValidationPipe implements IPipe {
     const options = {
       ignoreCallback: (obj: any, type: any) => type === Date,
       checkRequiredValue: false,
-      additionalProperties: metadata.paramType === ParamTypes.QUERY ? "ignore" : undefined,
+      additionalProperties: metadata.paramType === ParamTypes.QUERY ? "ignore" : undefined
     };
 
     if (metadata.isCollection) {

diff --git a/packages/ajv/src/services/Ajv.spec.ts b/packages/ajv/src/services/Ajv.spec.ts
@@ -13,15 +13,15 @@ describe("Ajv", () => {
     expect(
       ajv.validate(
         {
-          type: "object",
+          type: "object"
         },
         {}
       )
     ).to.equal(true);
 
     ajv.validate(
       {
-        type: "object",
+        type: "object"
       },
       []
     );
@@ -32,10 +32,10 @@ describe("Ajv", () => {
         keyword: "type",
         message: "should be object",
         params: {
-          type: "object",
+          type: "object"
         },
-        schemaPath: "#/type",
-      },
+        schemaPath: "#/type"
+      }
     ]);
   });
 });
diff --git a/packages/ajv/src/services/Ajv.ts b/packages/ajv/src/services/Ajv.ts
@@ -16,7 +16,7 @@ registerProvider({
     return new Ajv({
       verbose: false,
       ...props,
-      ...options,
+      ...options
     });
-  },
+  }
 });
diff --git a/packages/common/src/config/services/ServerSettingsService.spec.ts b/packages/common/src/config/services/ServerSettingsService.spec.ts
@@ -21,23 +21,23 @@ describe("ServerSettingsService", () => {
         version: "1.0.0",
         uploadDir: "${rootDir}/uploads",
         scopes: {
-          [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,
+          [ProviderType.CONTROLLER]: ProviderScope.SINGLETON
         },
         logger: {
           debug: false,
           level: "info",
           logRequest: true,
-          jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2,
+          jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
         },
         errors: {
-          headerName: "errors",
+          headerName: "errors"
         },
         mount: {
-          "/rest": "${rootDir}/controllers/**/*.ts",
+          "/rest": "${rootDir}/controllers/**/*.ts"
         },
         exclude: ["**/*.spec.ts", "**/*.spec.js"],
         componentsScan: ["${rootDir}/controllers/**/*.ts", "${rootDir}/services/**/*.ts", "${rootDir}/converters/**/*.ts"],
-        controllerScope: ProviderScope.SINGLETON,
+        controllerScope: ProviderScope.SINGLETON
       }).forEach(([key, value]) => {
         settings[key] = value;
       });
@@ -89,14 +89,14 @@ describe("ServerSettingsService", () => {
     it("should return httpsPort", () => {
       expect(settings.getHttpsPort()).to.deep.equal({
         address: "address",
-        port: 8080,
+        port: 8080
       });
     });
 
     it("should return httpPort", () => {
       expect(settings.getHttpPort()).to.deep.equal({
         address: "address",
-        port: 8081,
+        port: 8081
       });
     });
 
@@ -180,14 +180,14 @@ describe("ServerSettingsService", () => {
       it("should return address and port from a concatened address and port", () => {
         expect((ServerSettingsService as any).buildAddressAndPort("0.0.0.0:9000")).to.deep.eq({
           address: "0.0.0.0",
-          port: 9000,
+          port: 9000
         });
       });
 
       it("should return address and port from a port number", () => {
         expect((ServerSettingsService as any).buildAddressAndPort(9000)).to.deep.eq({
           address: "0.0.0.0",
-          port: 9000,
+          port: 9000
         });
       });
     });
@@ -216,26 +216,26 @@ describe("ServerSettingsService", () => {
         const store = new Storage();
         const result = settings.resolve({
           path: "${rootDir}",
-          storage: store,
+          storage: store
         });
 
         expect(result).to.deep.eq({
           path: process.cwd(),
-          storage: new Storage(),
+          storage: new Storage()
         });
       });
 
       it("should replace rootDir", () => {
         expect(settings.resolve({other: null, resolve: "${rootDir}"})).to.deep.eq({
           other: null,
-          resolve: process.cwd(),
+          resolve: process.cwd()
         });
       });
 
       it("should replace rootDir", () => {
         expect(settings.resolve({other: 808, resolve: "${rootDir}"})).to.deep.eq({
           other: 808,
-          resolve: process.cwd(),
+          resolve: process.cwd()
         });
       });
     });
@@ -262,7 +262,7 @@ describe("ServerSettingsService", () => {
       Sinon.stub($log.appenders, "set");
 
       settings.logger = {
-        format: "format",
+        format: "format"
       };
     });
 
@@ -277,17 +277,17 @@ describe("ServerSettingsService", () => {
         levels: ["info", "debug"],
         layout: {
           type: "pattern",
-          pattern: "format",
-        },
+          pattern: "format"
+        }
       });
 
       expect($log.appenders.set).to.have.been.calledWithExactly("stderr", {
         levels: ["trace", "fatal", "error", "warn"],
         type: "stderr",
         layout: {
           type: "pattern",
-          pattern: "format",
-        },
+          pattern: "format"
+        }
       });
     });
   });

diff --git a/packages/common/src/config/services/ServerSettingsService.ts b/packages/common/src/config/services/ServerSettingsService.ts
@@ -12,7 +12,7 @@ const rootDir = process.cwd();
  */
 @Injectable({
   scope: ProviderScope.SINGLETON,
-  global: true,
+  global: true
 })
 export class ServerSettingsService extends DIConfiguration {
   constructor() {
@@ -24,27 +24,27 @@ export class ServerSettingsService extends DIConfiguration {
       version: "1.0.0",
       uploadDir: "${rootDir}/uploads",
       scopes: {
-        [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,
+        [ProviderType.CONTROLLER]: ProviderScope.SINGLETON
       },
       logger: {
         debug: false,
         level: "info",
         logRequest: true,
-        jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2,
+        jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
       },
       errors: {
-        headerName: "errors",
+        headerName: "errors"
       },
       mount: {
-        "/rest": "${rootDir}/controllers/**/*.ts",
+        "/rest": "${rootDir}/controllers/**/*.ts"
       },
       exclude: ["**/*.spec.ts", "**/*.spec.js"],
       componentsScan: [
         "${rootDir}/mvc/**/*.ts",
         "${rootDir}/services/**/*.ts",
         "${rootDir}/middlewares/**/*.ts",
-        "${rootDir}/converters/**/*.ts",
-      ],
+        "${rootDir}/converters/**/*.ts"
+      ]
     });
   }
 
@@ -209,17 +209,17 @@ export class ServerSettingsService extends DIConfiguration {
         levels: ["info", "debug"],
         layout: {
           type: "pattern",
-          pattern: logger.format,
-        },
+          pattern: logger.format
+        }
       });
 
       $log.appenders.set("stderr", {
         levels: ["trace", "fatal", "error", "warn"],
         type: "stderr",
         layout: {
           type: "pattern",
-          pattern: logger.format,
-        },
+          pattern: logger.format
+        }
       });
     }
   }