@spark-ui/cli-utils 2.12.9-beta.2 → 2.12.9-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spark-ui/cli-utils",
-  "version": "2.12.9-beta.2",
+  "version": "2.12.9-beta.3",
   "description": "Spark CLI utils",
   "publishConfig": {
     "access": "public"
@@ -15,12 +15,6 @@
     "spark-generate": "./bin/spark-generate.mjs",
     "spark-scan": "./bin/spark-scan.mjs"
   },
-  "exports": {
-    ".": {
-      "import": "./src/index.mjs",
-      "require": "./src/index.js"
-    }
-  },
   "type": "module",
   "repository": {
     "type": "git",

package/src/scan/index.mjs

@@ -35,28 +35,28 @@ export async function adoption(options) {
 
   const extensions = config.adoption.extensions
 
-  let lastScanCount = 0
-  const importCount = 0
+  let importCount = 0
   const importResults = {}
   let importsUsed = {}
   let importsCount = {}
   config.adoption.imports.forEach(moduleName => {
     console.log(`scanning adoption for ${moduleName}`)
     const directoryPath = path.join(process.cwd(), config.adoption.directory)
-    scanDirectories(directoryPath, moduleName, extensions, scanCallback, {
+
+    const response = scanDirectories(directoryPath, moduleName, extensions, scanCallback, {
       importCount,
       importResults,
       importsUsed,
       importsCount,
     })
-    if (importCount !== lastScanCount) {
+    if (importCount !== response.importCount) {
       logger.success(
-        `Found ${importCount - lastScanCount} files with "${moduleName}" imports across directory ${directoryPath}:`
+        `Found ${response.importCount - importCount} imports with "${moduleName}" modules across directory ${directoryPath}.`
       )
     } else {
       logger.warn(`No files found with "${moduleName}" imports across directory ${directoryPath}.`)
     }
-    lastScanCount = importCount
+    importCount = response.importCount
   })
 
   // Sort importsUsed by alphabet
@@ -64,9 +64,9 @@ export async function adoption(options) {
     importsUsed = Object.fromEntries(
       Object.entries(importsUsed)
         .sort(([pkgNameA], [pkgNameB]) => pkgNameA.localeCompare(pkgNameB))
-        .map(([pkgname, content]) => {
+        .map(([pkgName, content]) => {
           return [
-            pkgname,
+            pkgName,
             {
               default: Object.fromEntries(
                 Object.entries(content.default).sort(([a], [b]) => a.localeCompare(b))

package/src/scan/scanCallback.mjs

@@ -1,7 +1,12 @@
 import extractImports from './utils/extract-imports.mjs'
 
-export function scanCallback(f, moduleName, { importResults, importsUsed, importsCount }) {
-  if (!f.fileContent) return
+export function scanCallback(
+  f,
+  moduleName,
+  { importCount, importResults, importsUsed, importsCount }
+) {
+  const response = { importCount, importResults, importsUsed, importsCount }
+  if (!f.fileContent) return response
 
   const imports = extractImports(f.filePath, moduleName)
 
@@ -39,18 +44,19 @@ export function scanCallback(f, moduleName, { importResults, importsUsed, import
         importsUsed.importsCount = importsCount[defaultImport] + 1
 
         importsCount[defaultImport] = importsCount[defaultImport] + 1 || 1
+        response.importCount++
       }
 
       if (namedImports.length) {
         namedImports.forEach(n => {
           importsUsed[moduleName].named[n] = importsUsed[moduleName].named[n] + 1 || 1
-        })
-
-        namedImports.forEach(n => {
           importsUsed[moduleName].importsCount = importsUsed[moduleName].importsCount + 1
           importsCount[n] = importsCount[n] + 1 || 1
+          response.importCount++
         })
       }
     })
   })
+
+  return response
 }

package/src/scan/utils/scan-directories.mjs

@@ -12,35 +12,34 @@ export function scanDirectories(
 ) {
   const files = fs.readdirSync(directoryPath)
 
+  let response = {
+    importCount,
+    importResults,
+    importsUsed,
+    importsCount,
+  }
+
   for (const file of files) {
     const filePath = path.join(directoryPath, file)
     const stats = fs.statSync(filePath)
 
     if (stats.isDirectory()) {
-      scanDirectories(filePath, importName, extensions, scanningCallback, {
-        importCount,
-        importResults,
-        importsUsed,
-        importsCount,
-      })
+      response = scanDirectories(filePath, importName, extensions, scanningCallback, response)
     } else if (stats.isFile() && extensions.includes(path.extname(filePath))) {
       const f = fileContainsImport(filePath, importName)
 
       if (f) {
-        scanningCallback(
+        response = scanningCallback(
           {
             filePath: f.filePath,
             fileContent: f.fileContent,
           },
           importName,
-          {
-            importCount,
-            importResults,
-            importsUsed,
-            importsCount,
-          }
+          response
         )
       }
     }
   }
+
+  return response
 }