Address code smells reported by sonar

queelag · Dec 25, 2023 · d8366e5 · d8366e5
1 parent 54d3712
commit d8366e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/list.ts b/src/components/list.ts
@@ -20,7 +20,7 @@ export class List extends Child {
           .every(
             (li: cheerio.Element) =>
               this.main.cheerio(li).has('a') &&
-              this.main.cheerio('a', li).text().match(this.regex) &&
+              this.regex.exec(this.main.cheerio('a', li).text()) &&
               !this.main.cheerio(li).html()?.includes('<em>') &&
               !this.main
                 .cheerio(li)

diff --git a/src/components/paragraph.ts b/src/components/paragraph.ts
@@ -15,7 +15,7 @@ export class Paragraph extends Child {
       .toArray()
       .filter(
         (p: cheerio.Element) =>
-          this.main.cheerio(p).html()?.includes('Currently holds no information.') && this.main.cheerio(p).prev('h4').text().match(this.regex)
+          this.main.cheerio(p).html()?.includes('Currently holds no information.') && this.regex.exec(this.main.cheerio(p).prev('h4').text())
       )
   }
 }
diff --git a/src/components/writer.ts b/src/components/writer.ts
@@ -53,8 +53,8 @@ export class Writer extends Child {
       case type.includes('Array of'):
         let arrayOfs: number, ands: number
 
-        arrayOfs = (type.match(/Array of/g) || []).length
-        ands = (type.match(/( and |,)/g) || []).length
+        arrayOfs = (type.match(/Array of/g) ?? []).length
+        ands = (type.match(/( and |,)/g) ?? []).length
 
         return (
           (ands > 0 ? '(' : '') +