Update Prettier configuration and fix trailing commas for improved co…

…de consistency
robsonalvesdevbr · Dec 13, 2024 · 9f7f1e2 · 9f7f1e2
1 parent 1900de3
commit 9f7f1e2
Show file tree

Hide file tree

Showing 17 changed files with 94 additions and 82 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -36,10 +36,7 @@ module.exports = {
     },
     {
       files: ['src/**/*.html'],
-      extends: [
-        'plugin:@angular-eslint/template/recommended',
-        'plugin:prettier/recommended',
-      ],
+      extends: ['plugin:@angular-eslint/template/recommended', 'plugin:prettier/recommended'],
       rules: {
         'prettier/prettier': [
           'error',
@@ -52,48 +49,62 @@ module.exports = {
   ],
 };
 
-// // @ts-check
-// const eslint = require("@eslint/js");
-// const tseslint = require("typescript-eslint");
-// const angular = require("angular-eslint");
-
-// module.exports = tseslint.config(
-//   {
-//     files: ["**/*.ts"],
-//     extends: [
-//       eslint.configs.recommended,
-//       ...tseslint.configs.recommended,
-//       ...tseslint.configs.stylistic,
-//       ...angular.configs.tsRecommended,
-//     ],
-//     processor: angular.processInlineTemplates,
-//     rules: {
-//       "@angular-eslint/directive-selector": [
-//         "error",
-//         {
-//           type: "attribute",
-//           prefix: "app",
-//           style: "camelCase",
-//         },
-//       ],
-//       "@angular-eslint/component-selector": [
-//         "error",
-//         {
-//           type: "element",
-//           prefix: "app",
-//           style: "kebab-case",
-//         },
+// module.exports = {
+//   root: true,
+//   ignorePatterns: ['node_modules/*', 'dist/*'],
+//   overrides: [
+//     {
+//       files: ['src/**/*.ts'],
+//       extends: [
+//         'eslint:recommended',
+//         'plugin:@typescript-eslint/recommended',
+//         'plugin:@angular-eslint/recommended',
+//         'plugin:prettier/recommended',
 //       ],
+//       parserOptions: {
+//         project: ['tsconfig.json'],
+//         createDefaultProgram: true,
+//       },
+//       rules: {
+//         '@angular-eslint/directive-selector': [
+//           'error',
+//           {
+//             type: 'attribute',
+//             prefix: 'app',
+//             style: 'camelCase',
+//           },
+//         ],
+//         '@angular-eslint/component-selector': [
+//           'error',
+//           {
+//             type: 'element',
+//             prefix: 'app',
+//             style: 'kebab-case',
+//           },
+//         ],
+//         'prettier/prettier': ['error', { endOfLine: 'auto' }],
+//         'max-len': [
+//           'error',
+//           {
+//             code: 120, // Define o comprimento máximo de uma linha
+//             ignoreStrings: true, // Ignora strings longas
+//             ignoreTemplateLiterals: true, // Ignora strings de template
+//             ignoreComments: true, // Ignora comentários
+//           },
+//         ],
+//       },
 //     },
-//   },
-//   {
-//     files: ["**/*.html"],
-//     extends: [
-//       ...angular.configs.templateRecommended,
-//       ...angular.configs.templateAccessibility,
-//     ],
-//     rules: {
-//       'prettier/prettier': ['error', { endOfLine: 'auto' }],
+//     {
+//       files: ['src/**/*.html'],
+//       extends: ['plugin:@angular-eslint/template/recommended', 'plugin:prettier/recommended'],
+//       rules: {
+//         'prettier/prettier': [
+//           'error',
+//           {
+//             parser: 'angular',
+//           },
+//         ],
+//       },
 //     },
-//   }
-// );
+//   ],
+// };
diff --git a/.prettierrc b/.prettierrc
@@ -3,5 +3,6 @@
   "printWidth": 80,
   "tabWidth": 2,
   "semi": true,
-  "endOfLine": "auto"
-}
+  "endOfLine": "auto",
+  "trailingComma": "es5"
+}
diff --git a/src/app/components/pages/about/abount.component.spec.ts b/src/app/components/pages/about/abount.component.spec.ts
@@ -20,8 +20,8 @@ describe('AbountComponent', () => {
     const compiled = fixture.nativeElement as HTMLElement;
     expect(
       compiled.querySelector(
-        'div.container div.text-center h3.section-subheading.text-muted',
-      )?.textContent,
+        'div.container div.text-center h3.section-subheading.text-muted'
+      )?.textContent
     ).toBe(' Saiba mais sobre minha carreira. ');
   });
 });
diff --git a/src/app/components/pages/book/book.component.ts b/src/app/components/pages/book/book.component.ts
@@ -44,12 +44,12 @@ export class BookComponent extends BasePageComponent implements OnInit {
   tags: WritableSignal<Set<string>> = signal<Set<string>>(new Set<string>());
 
   publishNameFilter: WritableSignal<Set<string>> = signal<Set<string>>(
-    new Set<string>(),
+    new Set<string>()
   );
   selectInstitutionsFilter: WritableSignal<string> = signal<string>('');
 
   tagsFilter: WritableSignal<Set<string>> = signal<Set<string>>(
-    new Set<string>(),
+    new Set<string>()
   );
   selectTagFilter: WritableSignal<string> = signal<string>('');
 
@@ -62,7 +62,7 @@ export class BookComponent extends BasePageComponent implements OnInit {
   ngOnInit(): void {
     //this.books.forEach((book) => this.publishNameList().add(book.publishName.trim()))
     this.books.forEach((book) =>
-      book.tags.forEach((tag) => this.tags().add(tag.trim())),
+      book.tags.forEach((tag) => this.tags().add(tag.trim()))
     );
   }
 
@@ -107,7 +107,7 @@ export class BookComponent extends BasePageComponent implements OnInit {
       this.publishNameFilter().add(id);
     }
     this.selectInstitutionsFilter.set(
-      Array.from(this.publishNameFilter().values()).join(','),
+      Array.from(this.publishNameFilter().values()).join(',')
     );
 
     this.config().currentPage = 1;

diff --git a/src/app/components/pages/course/course.component.ts b/src/app/components/pages/course/course.component.ts
@@ -49,11 +49,11 @@ export class CourseComponent extends BasePageComponent implements OnInit {
     Set<InstitutionEnum>
   >(new Set<InstitutionEnum>());
   selectInstitutionsFilter: WritableSignal<string> = signal<string>(
-    InstitutionEnum.All,
+    InstitutionEnum.All
   );
 
   tagsFilter: WritableSignal<Set<string>> = signal<Set<string>>(
-    new Set<string>(),
+    new Set<string>()
   );
   selectTagFilter: WritableSignal<string> = signal<string>('');
 
@@ -65,7 +65,7 @@ export class CourseComponent extends BasePageComponent implements OnInit {
 
   ngOnInit(): void {
     this.courses.forEach((course) =>
-      course.tags.forEach((tag) => this.tags().add(tag.trim())),
+      course.tags.forEach((tag) => this.tags().add(tag.trim()))
     );
   }
 
@@ -105,7 +105,7 @@ export class CourseComponent extends BasePageComponent implements OnInit {
       this.coursesFilter().add(institution);
     }
     this.selectInstitutionsFilter.set(
-      Array.from(this.coursesFilter().values()).join(','),
+      Array.from(this.coursesFilter().values()).join(',')
     );
 
     this.config().currentPage = 1;

diff --git a/src/app/components/pages/footer/footer.component.spec.ts b/src/app/components/pages/footer/footer.component.spec.ts
@@ -19,7 +19,7 @@ describe('FooterComponent', () => {
     //fixture.detectChanges()
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('div.container')?.textContent).toContain(
-      'Terms of Use',
+      'Terms of Use'
     );
   });
 });
diff --git a/src/app/components/pages/graduation/graduation.component.spec.ts b/src/app/components/pages/graduation/graduation.component.spec.ts
@@ -20,8 +20,8 @@ describe('GraduationComponent', () => {
     const compiled = fixture.nativeElement as HTMLElement;
     expect(
       compiled.querySelector(
-        'div.container div.text-center h2.section-heading.text-uppercase',
-      )?.textContent,
+        'div.container div.text-center h2.section-heading.text-uppercase'
+      )?.textContent
     ).toBe('(Pós)Graduação');
   });
 });
diff --git a/src/app/components/pages/masterhead/masterhead.component.spec.ts b/src/app/components/pages/masterhead/masterhead.component.spec.ts
@@ -20,7 +20,7 @@ describe('MasterheadComponent', () => {
     const compiled = fixture.nativeElement as HTMLElement;
     expect(
       compiled.querySelector('div.container div.masthead-subheading')
-        ?.textContent,
+        ?.textContent
     ).toBe('Bem vindo ao meu Website');
   });
 });
diff --git a/src/app/components/pages/navigation/navigation.component.spec.ts b/src/app/components/pages/navigation/navigation.component.spec.ts
@@ -19,22 +19,22 @@ describe('NavigationComponent', () => {
     //fixture.detectChanges()
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      'Sobre',
+      'Sobre'
     );
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      '(Pós)Graduação',
+      '(Pós)Graduação'
     );
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      'Cursos',
+      'Cursos'
     );
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      'Formação',
+      'Formação'
     );
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      'Leituras',
+      'Leituras'
     );
     expect(compiled.querySelector('#navbarResponsive')?.textContent).toContain(
-      'Contato',
+      'Contato'
     );
   });
 });
diff --git a/src/app/directives/google-analytics.directive.sec.ts b/src/app/directives/google-analytics.directive.sec.ts
@@ -50,7 +50,7 @@ describe('GoogleAnalyticsDirective', () => {
     expect(gaService.logEvent).toHaveBeenCalledWith(
       'click_event',
       'button',
-      'test_button',
+      'test_button'
     );
   });
 
@@ -72,7 +72,7 @@ describe('GoogleAnalyticsDirective', () => {
       'robsonalves',
       'azure',
       'black_friday_promotion',
-      'button+test_button',
+      'button+test_button'
     );
   });
 

diff --git a/src/app/directives/google-analytics.directive.ts b/src/app/directives/google-analytics.directive.ts
@@ -31,7 +31,7 @@ export class GoogleAnalyticsDirective {
         'robsonalves',
         'azure',
         'black_friday_promotion',
-        campaignData,
+        campaignData
       );
     }
   }

diff --git a/src/app/pipes/filter.pipe.spec.ts b/src/app/pipes/filter.pipe.spec.ts
@@ -77,7 +77,7 @@ describe('FilterPipe', () => {
       data,
       'string',
       'category',
-      'fiction,adventure',
+      'fiction,adventure'
     );
     expect(result.length).toBe(2);
     expect(result).toEqual([

diff --git a/src/app/pipes/filter.pipe.ts b/src/app/pipes/filter.pipe.ts
@@ -9,7 +9,7 @@ export class FilterPipe implements PipeTransform {
     data: any[],
     typeField: 'string' | 'array',
     filterProperty: any,
-    filter: string,
+    filter: string
   ): any[] {
     const filterLowerCase = filter.toLowerCase().split(',');
 
@@ -18,7 +18,7 @@ export class FilterPipe implements PipeTransform {
         return filterLowerCase.includes(field.toLowerCase());
       } else {
         return (field as string[]).some((f) =>
-          filterLowerCase.includes(f.toLowerCase()),
+          filterLowerCase.includes(f.toLowerCase())
         );
       }
     };

diff --git a/src/app/pipes/message-date-conclusion.pipe.spec.ts b/src/app/pipes/message-date-conclusion.pipe.spec.ts
@@ -25,7 +25,7 @@ describe('MessageDateConclusionPipe', () => {
 
   it('should return "Estado desconhecido" when conclusionStatus is not "completed", "locked" or "inprogress"', () => {
     expect(pipe.transform('unknown' as 'completed')).toBe(
-      'Estado desconhecido',
+      'Estado desconhecido'
     );
   });
 });
diff --git a/src/app/pipes/sortby.pipe.ts b/src/app/pipes/sortby.pipe.ts
@@ -8,7 +8,7 @@ export class SortbyPipe implements PipeTransform {
   transform<T>(
     array: T[],
     field?: keyof T,
-    order: 'asc' | 'desc' = 'asc',
+    order: 'asc' | 'desc' = 'asc'
   ): T[] {
     if (!Array.isArray(array)) {
       return array;
@@ -23,7 +23,7 @@ export class SortbyPipe implements PipeTransform {
 
   private getSortFn<T>(
     field?: keyof T,
-    order: 'asc' | 'desc' = 'asc',
+    order: 'asc' | 'desc' = 'asc'
   ): (a: T, b: T) => number {
     return (a: T, b: T): number => {
       const comparison = this.compareValues(a, b, field);
@@ -54,7 +54,7 @@ export class SortbyPipe implements PipeTransform {
   // Dica: use o método sort do array
   sortString(array: string[], order: 'asc' | 'desc'): string[] {
     return array.sort((a, b) =>
-      order === 'asc' ? a.localeCompare(b) : b.localeCompare(a),
+      order === 'asc' ? a.localeCompare(b) : b.localeCompare(a)
     );
   }
 }
diff --git a/src/app/services/google-analytics.service.ts b/src/app/services/google-analytics.service.ts
@@ -23,8 +23,8 @@ export class GoogleAnalyticsService {
       .pipe(
         filter(
           (event: Event): event is NavigationEnd =>
-            event instanceof NavigationEnd,
-        ),
+            event instanceof NavigationEnd
+        )
       )
       .subscribe(() => {
         this._sendPageView();
@@ -83,7 +83,7 @@ export class GoogleAnalyticsService {
     id: string,
     source: string,
     name: string,
-    term: string,
+    term: string
   ): void {
     gtag('set', campaign, {
       id: id,

diff --git a/src/main.ts b/src/main.ts
@@ -3,5 +3,5 @@ import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
 bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  console.error(err),
+  console.error(err)
 );