fix: resolve linter issues

kkoomen · May 1, 2022 · 7fee3af · 7fee3af
1 parent d2c203a
commit 7fee3af
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 863 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "printWidth": 80,
+  "printWidth": 100,
   "singleQuote": true,
   "trailingComma": "all"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.14.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",

diff --git a/src/index.ts b/src/index.ts
@@ -26,11 +26,7 @@ if (languageParser) {
   const sourceCode = fs.readFileSync(filepath, { encoding: 'utf8', flag: 'r' });
 
   const tree = parser.parse(sourceCode);
-  const parserService = getParserService(language, [
-    tree.rootNode,
-    lineNumber,
-    nodeTypes,
-  ]);
+  const parserService = getParserService(language, [tree.rootNode, lineNumber, nodeTypes]);
   if (parserService) {
     parserService.traverse(tree.rootNode);
     parserService.output();

diff --git a/src/parsers/base-parser.service.ts b/src/parsers/base-parser.service.ts
@@ -11,10 +11,7 @@ export class BaseParserService {
     }
   }
 
-  protected runNodeParser(
-    parser: (node: SyntaxNode) => void,
-    node: SyntaxNode,
-  ): void {
+  protected runNodeParser(parser: (node: SyntaxNode) => void, node: SyntaxNode): void {
     this.done = true;
     parser.bind(this)(node);
   }

diff --git a/src/parsers/bash.service.ts b/src/parsers/bash.service.ts
@@ -6,9 +6,7 @@ enum NodeType {
   FUNCTION_DEFINITION = 'function_definition',
 }
 
-export class BashParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class BashParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,

diff --git a/src/parsers/c.service.ts b/src/parsers/c.service.ts
@@ -9,9 +9,7 @@ enum NodeType {
   FIELD_DECLARATION = 'field_declaration',
 }
 
-export class CParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class CParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -82,18 +80,11 @@ export class CParserService
             .shift()?.text;
 
           childNode.children
-            .filter((n: SyntaxNode) =>
-              ['parameter_list', 'parameter_declaration'].includes(n.type),
-            )
+            .filter((n: SyntaxNode) => ['parameter_list', 'parameter_declaration'].includes(n.type))
             .map((n: SyntaxNode) =>
-              n.children.filter(
-                (cn: SyntaxNode) => cn.type === 'parameter_declaration',
-              ),
-            )
-            .reduce(
-              (items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr],
-              [],
+              n.children.filter((cn: SyntaxNode) => cn.type === 'parameter_declaration'),
             )
+            .reduce((items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr], [])
             .forEach((n: SyntaxNode) => {
               const param: Record<string, any> = { name: null, type: null };
 

diff --git a/src/parsers/cpp.service.ts b/src/parsers/cpp.service.ts
@@ -12,9 +12,7 @@ enum NodeType {
   FUNCTION_DECLARATOR = 'function_declarator',
 }
 
-export class CppParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class CppParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private lineNumber: number,
@@ -32,10 +30,7 @@ export class CppParserService
       switch (node.type) {
         case NodeType.TEMPLATE_DECLARATION: {
           const childNode: SyntaxNode = node.children
-            .filter(
-              (n: SyntaxNode) =>
-                n.previousSibling?.type === 'template_parameter_list',
-            )
+            .filter((n: SyntaxNode) => n.previousSibling?.type === 'template_parameter_list')
             .shift() as SyntaxNode;
           this.lineNumber = childNode.startPosition.row;
           this.traverse(childNode);
@@ -133,9 +128,7 @@ export class CppParserService
           // Method name.
           childNode.children
             .filter((n: SyntaxNode) =>
-              ['identifier', 'scoped_identifier', 'field_identifier'].includes(
-                n.type,
-              ),
+              ['identifier', 'scoped_identifier', 'field_identifier'].includes(n.type),
             )
             .forEach((n: SyntaxNode) => {
               if (['identifier', 'field_identifier'].includes(n.type)) {
@@ -149,9 +142,7 @@ export class CppParserService
 
           // Parameters.
           childNode.children
-            .filter((n: SyntaxNode) =>
-              ['parameter_list', 'parameter_declaration'].includes(n.type),
-            )
+            .filter((n: SyntaxNode) => ['parameter_list', 'parameter_declaration'].includes(n.type))
             .map((n: SyntaxNode) =>
               n.children.filter((cn: SyntaxNode) =>
                 [
@@ -162,10 +153,7 @@ export class CppParserService
                 ].includes(cn.type),
               ),
             )
-            .reduce(
-              (items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr],
-              [],
-            )
+            .reduce((items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr], [])
             .forEach((n: SyntaxNode) => {
               const param: Record<string, any> = { name: null, type: null };
 
@@ -239,9 +227,7 @@ export class CppParserService
     });
   }
 
-  private getTypeParameters(
-    node: SyntaxNode,
-  ): Array<Record<'name', null | string>> {
+  private getTypeParameters(node: SyntaxNode): Array<Record<'name', null | string>> {
     const typeparams: Array<Record<'name', null | string>> = [];
 
     node.children
@@ -255,10 +241,7 @@ export class CppParserService
           ].includes(cn.type),
         ),
       )
-      .reduce(
-        (items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr],
-        [],
-      )
+      .reduce((items: SyntaxNode[], curr: SyntaxNode[]) => [...items, ...curr], [])
       .forEach((n: SyntaxNode) => {
         const param: Record<string, any> = { name: null };
 

diff --git a/src/parsers/index.ts b/src/parsers/index.ts
@@ -27,7 +27,7 @@ export type ParserService =
 export function getParserService(
   language: ValueOf<Language>,
   args: [SyntaxNode, number, string[]],
-): ParserService | undefined {
+): ParserService | null {
   switch (language) {
     case Language.PHP:
       return new PhpParserService(...args);
@@ -64,4 +64,6 @@ export function getParserService(
       console.error(`Could not get parser service for unknown language: ${language}`);
       break;
   }
+
+  return null;
 }
diff --git a/src/parsers/java.service.ts b/src/parsers/java.service.ts
@@ -6,9 +6,7 @@ enum NodeType {
   METHOD_DECLARATION = 'method_declaration',
 }
 
-export class JavaParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class JavaParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -77,9 +75,7 @@ export class JavaParserService
 
         case 'formal_parameters': {
           childNode.children
-            .filter((n: SyntaxNode) =>
-              ['formal_parameter', 'spread_parameter'].includes(n.type),
-            )
+            .filter((n: SyntaxNode) => ['formal_parameter', 'spread_parameter'].includes(n.type))
             .forEach((cn: SyntaxNode) => {
               const param: Record<string, any> = { name: null, type: null };
 

diff --git a/src/parsers/lua.service.ts b/src/parsers/lua.service.ts
@@ -8,9 +8,7 @@ enum NodeType {
   FUNCTION_DEFINITION = 'function_definition',
 }
 
-export class LuaParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class LuaParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -63,9 +61,7 @@ export class LuaParserService
       switch (childNode.type) {
         case 'function_name': {
           this.result.name =
-            childNode.childCount > 0
-              ? childNode.children.pop()?.text
-              : childNode.text;
+            childNode.childCount > 0 ? childNode.children.pop()?.text : childNode.text;
           break;
         }
 

diff --git a/src/parsers/php.service.ts b/src/parsers/php.service.ts
@@ -8,9 +8,7 @@ enum NodeType {
   PROPERTY_DECLARATION = 'property_declaration',
 }
 
-export class PhpParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class PhpParserService extends BaseParserService implements CustomParserService {
   constructor(
     private readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -93,17 +91,15 @@ export class PhpParserService
     return fqn;
   }
 
-  private getClassPropertyTypeViaConstructor(
-    node: SyntaxNode,
-  ): string | undefined {
+  private getClassPropertyTypeViaConstructor(node: SyntaxNode): string | null {
     const propertyName: string | undefined = node?.children
       .filter((n: SyntaxNode) => n.type === 'property_element')
       .shift()
       ?.children.shift()
       ?.children.pop()?.text;
 
     if (!propertyName) {
-      return;
+      return null;
     }
 
     const constructorNode: SyntaxNode | undefined = node?.parent?.children
@@ -117,7 +113,7 @@ export class PhpParserService
       .shift();
 
     if (!constructorNode) {
-      return;
+      return null;
     }
 
     let paramName: string | undefined;
@@ -143,7 +139,7 @@ export class PhpParserService
       });
 
     if (!paramName) {
-      return;
+      return null;
     }
 
     const paramType: string | undefined = constructorNode?.children
@@ -162,7 +158,7 @@ export class PhpParserService
       )
       .shift()?.text;
 
-    return paramType;
+    return paramType as string;
   }
 
   private parseClassProperty(node: SyntaxNode): void {

diff --git a/src/parsers/python.service.ts b/src/parsers/python.service.ts
@@ -7,9 +7,7 @@ enum NodeType {
   MODULE = 'module',
 }
 
-export class PythonParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class PythonParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -74,10 +72,7 @@ export class PythonParserService
             .forEach((cn: SyntaxNode, index: number) => {
               // If this is a class method then we don't want to add the first
               // parameter, because that will be the 'self' keyword.
-              if (
-                node.parent?.parent?.type === 'class_definition' &&
-                index === 0
-              ) {
+              if (node.parent?.parent?.type === 'class_definition' && index === 0) {
                 return;
               }
 
@@ -98,11 +93,7 @@ export class PythonParserService
                     param.name = pn.text;
                   }
 
-                  if (
-                    ['list_splat_pattern', 'dictionary_splat_pattern'].includes(
-                      pn.type,
-                    )
-                  ) {
+                  if (['list_splat_pattern', 'dictionary_splat_pattern'].includes(pn.type)) {
                     param.name = pn.children
                       .filter((cpn: SyntaxNode) => cpn.type === 'identifier')
                       .shift()?.text;

diff --git a/src/parsers/ruby.service.ts b/src/parsers/ruby.service.ts
@@ -7,9 +7,7 @@ enum NodeType {
   SINGLETON_METHOD = 'singleton_method',
 }
 
-export class RubyParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class RubyParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,

diff --git a/src/parsers/rust.service.ts b/src/parsers/rust.service.ts
@@ -6,9 +6,7 @@ enum NodeType {
   FUNCTION_ITEM = 'function_item',
 }
 
-export class RustParserService
-  extends BaseParserService
-  implements CustomParserService {
+export class RustParserService extends BaseParserService implements CustomParserService {
   constructor(
     readonly rootNode: SyntaxNode,
     private readonly lineNumber: number,
@@ -66,10 +64,7 @@ export class RustParserService
 
         case 'generic_type': {
           const hasResultReturnType = childNode.children
-            .filter(
-              (n: SyntaxNode) =>
-                n.type === 'type_identifier' && n.text === 'Result',
-            )
+            .filter((n: SyntaxNode) => n.type === 'type_identifier' && n.text === 'Result')
             .shift();
           if (hasResultReturnType) {
             this.result.errors = true;
@@ -82,9 +77,8 @@ export class RustParserService
             .filter((n: SyntaxNode) => n.type === 'parameter')
             .forEach((child: SyntaxNode) => {
               this.result.parameters.push({
-                name: child.children
-                  .filter((n: SyntaxNode) => n.type === 'identifier')
-                  .shift()?.text,
+                name: child.children.filter((n: SyntaxNode) => n.type === 'identifier').shift()
+                  ?.text,
               });
             });
           break;