Syntaxing Class-based implementation and legacy support (#10)

Syntaxing `Class-based` implementation and legacy support

Author: EmptyWork

src/lib/application.class.js

@@ -2,15 +2,7 @@ import { series } from "async"
 import { exec } from 'child_process'
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs'
 import { getCategoriesFlags, getCategoriesFromCategoriesFlags, getCurrentCategories } from "./categoriesHandlers.class.js"
-import { makeCommandFromURL } from "./commandHandlers.js"
-
-Object.prototype.isEmpty = (obj) => {
-    for (const prop in obj) (Object.hasOwn(obj, prop)) ? false : true
-}
-
-Array.prototype.isEmpty = (arr) => {
-    return (arr === undefined || arr.length === 0) ? false : true
-}
+import Command from "./commandHandlers.class.js"
 
 export default class ThesisLighthouse {
     options
@@ -20,20 +12,10 @@ export default class ThesisLighthouse {
         this.options = appOptions
         this.execOptions = execOptions
         this.urlList = urlList
-
-        if (this.options?.consoleLog) console.log(this.options)
-
-        const isOptionsCategories = getCategoriesFlags(this.options?.categories)
-        const currentFlags = `${isOptionsCategories}\n\t--output json \n\t--disable-full-page-screenshot \n\t--chrome-flags="\n\t\t--no-sandbox \n\t\t--headless \n\t\t--disable-gpu"`
-
-        console.log(`ThesisLighthouse ${process.env.npm_package_version} - Thesis Example Code`)
-        console.log(`Running with these flags: ${currentFlags}\n`)
-
-        this.urlList.forEach((url, index) => { this.testURL(url, this.options) })
     }
 
     testURL(urlToCheck, options = {}) {
-        const { commandToRun } = makeCommandFromURL(urlToCheck, options)
+        const { commandToRun } = Command.make(urlToCheck, options)
         if (options?.consoleLog ?? true) console.log(`Running Test on ${urlToCheck}`)
 
         series([
@@ -78,4 +60,16 @@ export default class ThesisLighthouse {
         writeFileSync(rawOutputFilename, JSON.stringify(data), { flag: 'w' })
         return writeFileSync('./out/scores.json', newAccessibilityJSON, { flag: 'w' })
     }
+
+    start() {
+        if (this.options?.consoleLog) console.log(this.options)
+
+        const isOptionsCategories = getCategoriesFlags(this.options?.categories)
+        const currentFlags = `${isOptionsCategories}\n\t--output json \n\t--disable-full-page-screenshot \n\t--chrome-flags="\n\t\t--no-sandbox \n\t\t--headless \n\t\t--disable-gpu"`
+
+        console.log(`ThesisLighthouse ${process.env.npm_package_version} - Thesis Example Code`)
+        console.log(`Running with these flags: ${currentFlags}\n`)
+
+        this.urlList.forEach((url, index) => { this.testURL(url, this.options) })
+    }
 }

src/lib/categoriesHandlers.class.js

@@ -1,22 +1,31 @@
 import Utility from './utilities.class.js'
 
 class Categories {
-    getCategoriesFlags = array => {
-        return (!Array.isEmpty(array) ?? false) ? `--only-categories=${lighthouseCategories(array ?? "accessibility")} ` : ""
+    // getCategoriesFlags = array => {
+    getFlags = array => {
+        return (!Utility.isEmpty(array) ?? false) ? `--only-categories=${lighthouseCategories(array ?? "accessibility")} ` : ""
     }
 
-    getCurrentCategories = categories => {
+    // getCurrentCategories = categories => {
+    getCurrent = categories => {
         return categories ?? ["accessibility", "pwa", "best-practices", "performance", "seo"]
     }
 
-    lighthouseCategories = (categories = []) => {
+    // lighthouseCategories = (categories = []) => {
+    lighthouse = (categories = []) => {
         return (typeof categories == "string") ? categories : categories.join(',')
     }
 
-    getCategoriesFromCategoriesFlags = array => {
+    // getCategoriesFromCategoriesFlags = array => {
+    getFromFlags = array => {
         return (!Utility.isEmpty(array)) ? array : undefined
     }
 }
 
-export const { getCategoriesFlags, lighthouseCategories, getCurrentCategories, getCategoriesFromCategoriesFlags } = new Categories()
-export default Categories
+export const {
+    getFlags: getCategoriesFlags, // deprecated: only use this for non-class implementation 
+    lighthouse: lighthouseCategories, // deprecated: only use this for non-class implementation 
+    getCurrent: getCurrentCategories, // deprecated: only use this for non-class implementation 
+    getFromFlags: getCategoriesFromCategoriesFlags // deprecated: only use this for non-class implementation 
+} = new Categories()
+export default new Categories()

src/lib/commandHandlers.class.js

@@ -0,0 +1,15 @@
+import { getCategoriesFlags } from "./categoriesHandlers.class.js"
+
+class Command {
+    make = (url, options) => {
+        const isOptionsCategories = getCategoriesFlags(options?.categories)
+        const currentFlags = `${isOptionsCategories}--output json --disable-full-page-screenshot --chrome-flags="--no-sandbox --headless --disable-gpu"`
+        const commandToRun = `lighthouse ${url} ${currentFlags}`
+        return { commandToRun, currentFlags }
+    }
+}
+
+export const {
+    make: makeCommandFromURL // deprecated: only use this for non-class implementation 
+} = new Command()
+export default new Command()