@spark-ui/cli-utils 2.14.0-beta.7 → 2.14.0-beta.8

package/bin/spark-scan.mjs

@@ -8,7 +8,7 @@ const program = new Command()
 program
   .command('adoption')
   .description('Scan @spark-ui adoption for .tsx files with given imports')
-  .option('-c, --configuration <config>', 'configuration file route', '.spark-ui.cjs')
+  .option('-c, --configuration <config>', 'configuration file route')
   .option('-o, --output <output>', 'output file route')
   .option('-v, --verbose', 'output log information', false)
   .option('-d, --details', 'output information about each match', config.details)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spark-ui/cli-utils",
-  "version": "2.14.0-beta.7",
+  "version": "2.14.0-beta.8",
   "description": "Spark CLI utils",
   "publishConfig": {
     "access": "public"

package/src/core/Logger.mjs

@@ -1,20 +1,50 @@
-/* eslint-disable no-console */
 import chalk from 'chalk'
 
 export class Logger {
-  success(message) {
-    console.log(chalk.green(message))
+  #force = false
+
+  constructor({ verbose }) {
+    this.verbose = verbose
+
+    if (typeof Logger.instance === 'object') {
+      return Logger.instance
+    }
+
+    Logger.instance = this
+
+    return this
+  }
+
+  #log({ type = v => v, force, verbose }, ...args) {
+    if (force || verbose) {
+      console.log(type(...args)) // eslint-disable-line no-console
+    }
+    this.#force = false
+  }
+
+  force() {
+    this.#force = true
+
+    return this
+  }
+
+  error(...args) {
+    this.#log({ type: chalk.red, force: this.#force, verbose: this.verbose }, ...args)
+  }
+
+  warning(...args) {
+    this.#log({ type: chalk.yellow, force: this.#force, verbose: this.verbose }, ...args)
   }
 
-  error(message) {
-    console.log(chalk.red(message))
+  info(...args) {
+    this.#log({ type: chalk.cyan, force: this.#force, verbose: this.verbose }, ...args)
   }
 
-  info(message) {
-    console.log(chalk.yellow(message))
+  success(...args) {
+    this.#log({ type: chalk.green, force: this.#force, verbose: this.verbose }, ...args)
   }
 
-  warning(message) {
-    console.log(chalk.green(message))
+  break() {
+    this.#log({ type: chalk.green, force: this.#force, verbose: this.verbose }, '')
   }
 }

package/src/scan/index.mjs

@@ -1,20 +1,22 @@
+/* eslint-disable complexity */
+/* eslint-disable max-lines-per-function */
 import * as process from 'node:process'
 
 import { existsSync, mkdirSync, writeFileSync } from 'fs'
 import merge from 'lodash.merge'
 import path from 'path'
 
+import { Logger } from '../core/index.mjs'
 import * as defaultConfig from './config.mjs'
 import { loadConfig } from './loadConfig.mjs'
 import { scanCallback } from './scanCallback.mjs'
-import { Logger, scanDirectories } from './utils/index.mjs'
+import { scanDirectories } from './utils/index.mjs'
 
-export async function adoption(options) {
+export async function adoption(options = {}) {
   const { configuration, ...optionsConfig } = options
-  const configFileRoute = path.join(process.cwd(), configuration || '.spark-ui.cjs')
 
   const logger = new Logger({ verbose: optionsConfig.verbose })
-  let config = await loadConfig(configFileRoute, { logger })
+  let config = await loadConfig(configuration, { logger })
 
   config = {
     adoption: merge(
@@ -26,7 +28,6 @@ export async function adoption(options) {
       }
     ),
   }
-  console.log(JSON.stringify(config, null, 2))
 
   let importCount = 0
   const importResults = {}
@@ -50,7 +51,7 @@ export async function adoption(options) {
         `🎉 Found ${response.importCount - importCount} imports with "${moduleName}" modules across directory ${directoryPath}.`
       )
     } else {
-      logger.warn(
+      logger.warning(
         `⚠️ No files found with "${moduleName}" imports across directory ${directoryPath}.`
       )
     }
@@ -115,8 +116,8 @@ export async function adoption(options) {
         mkdirSync(dir, { recursive: true })
       }
       writeFileSync(`${path.join(process.cwd(), output)}`, JSON.stringify(result, null, 2))
-    } catch (err) {
-      logger.error(`💥 Error writing file: ${err}`)
+    } catch (error) {
+      logger.error(`💥 Error writing file: ${error}`)
       process.exit(1)
     }
   } else {

package/src/scan/loadConfig.mjs

@@ -1,10 +1,14 @@
+import process from 'node:process'
+
 import { existsSync } from 'fs'
 import merge from 'lodash.merge'
+import path from 'path'
 
 import * as defaultConfig from './config.mjs'
 
-export async function loadConfig(configFileRoute, { logger }) {
+export async function loadConfig(configuration, { logger }) {
   try {
+    const configFileRoute = path.join(process.cwd(), configuration || '.spark-ui.cjs')
     if (existsSync(configFileRoute)) {
       logger.info('ℹ️ Loading spark-ui custom configuration file')
       const { default: customConfig } = await import(configFileRoute)
@@ -19,13 +23,17 @@ export async function loadConfig(configFileRoute, { logger }) {
 
       return config
     } else {
-      logger.warn('⚠️ No custom configuration file found')
+      if (configuration) {
+        logger.error('⚠️ No custom configuration file found:', configFileRoute)
+        process.exit(1)
+      }
+      logger.warning('⚠️ No custom configuration file found')
       logger.info('ℹ️ Loading default configuration')
 
       return { ...defaultConfig }
     }
   } catch (error) {
-    logger.error('💥 Something went wrong loading the custom configuration file')
+    logger.error('💥 Something went wrong loading the custom configuration file', error)
 
     return { ...defaultConfig }
   }

package/src/scan/utils/index.mjs

@@ -1,5 +1,4 @@
 export { extractImports } from './extract-imports.mjs'
 export { fileContainsImport } from './file-contains-import.mjs'
 export { getFormatedTimestamp } from './get-formated-timestamp.mjs'
-export { Logger } from './logger.mjs'
 export { scanDirectories } from './scan-directories.mjs'

package/src/scan/utils/logger.mjs

@@ -1,55 +0,0 @@
-import chalk from 'chalk'
-
-export class Logger {
-  #force = false
-
-  constructor({ verbose }) {
-    this.verbose = verbose
-
-    if (typeof Logger.instance === 'object') {
-      return Logger.instance
-    }
-
-    Logger.instance = this
-
-    return this
-  }
-
-  #log({ type = v => v, force, verbose }, ...args) {
-    if (force || verbose) {
-      console.log(type(...args)) // eslint-disable-line no-console
-    }
-    this.#force = false
-  }
-
-  force() {
-    this.#force = true
-
-    return this
-  }
-
-  error(...args) {
-    this.#log({ type: chalk.red, force: this.#force, verbose: this.verbose }, ...args)
-    // this.verbose && console.log(chalk.red(...args))
-  }
-
-  warn(...args) {
-    this.#log({ type: chalk.yellow, force: this.#force, verbose: this.verbose }, ...args)
-    // this.verbose && console.log(chalk.yellow(...args))
-  }
-
-  info(...args) {
-    this.#log({ type: chalk.cyan, force: this.#force, verbose: this.verbose }, ...args)
-    // this.verbose && console.log(chalk.cyan(...args))
-  }
-
-  success(...args) {
-    this.#log({ type: chalk.green, force: this.#force, verbose: this.verbose }, ...args)
-    // this.verbose && console.log(chalk.green(...args))
-  }
-
-  break() {
-    this.#log({ type: chalk.green, force: this.#force, verbose: this.verbose }, '')
-    // this.verbose && console.log('')
-  }
-}