Include the file list that match overridable imports

Author: adamraya

packages/pwa-kit-dev/bin/pwa-kit-dev.js

@@ -547,21 +547,45 @@ const main = async () => {
                     return
                 }
 
-                const unusedOverrides = allOverrideFiles.filter(
-                    (file) => !hasCorrespondingOverridableImport(file, imports, projectDir)
+                // Separate override files into matched and unmatched using array methods
+                const {matchedOverrides, unmatchedOverrides} = allOverrideFiles.reduce(
+                    (acc, file) => {
+                        const key = hasCorrespondingOverridableImport(file, imports, projectDir)
+                            ? 'matchedOverrides'
+                            : 'unmatchedOverrides'
+                        acc[key].push(file)
+                        return acc
+                    },
+                    {matchedOverrides: [], unmatchedOverrides: []}
                 )
 
+                // Report on matched overrides using template literals
                 console.log(
-                    unusedOverrides.length
+                    matchedOverrides.length
+                        ? chalk.green(
+                              `Found ${matchedOverrides.length} override files that match overridable imports:`
+                          )
+                        : chalk.yellow('No override files match any overridable imports.')
+                )
+
+                matchedOverrides.forEach((file) =>
+                    console.log(`  - ${chalk.cyan(p.relative(projectDir, file))}`)
+                )
+
+                console.log('')
+
+                // Report on unmatched overrides using template literals
+                console.log(
+                    unmatchedOverrides.length
                         ? chalk.yellow(
-                              `Found ${unusedOverrides.length} override files that don't match any overridable imports:`
+                              `Found ${unmatchedOverrides.length} override files that don't match any overridable imports:`
                           )
                         : chalk.green(
                               `All ${allOverrideFiles.length} override files correspond to overridable imports.`
                           )
                 )
 
-                unusedOverrides.forEach((file) =>
+                unmatchedOverrides.forEach((file) =>
                     console.log(`  - ${p.relative(projectDir, file)}`)
                 )
 

packages/pwa-kit-extension-sdk/src/shared/utils/overridables.ts

@@ -140,33 +140,33 @@ export const hasCorrespondingOverridableImport = (
 
     // Get the relative path from the overrides directory
     const relativePath = path.relative(baseDir, overrideFile)
-    
+
     // Split the path into parts to extract extension name and component path
     const pathParts = relativePath.split(path.sep)
-    
+
     // The first part should be the extension name
     const extensionName = pathParts[0]
-    
+
     // Extract the file name without extension
     const fileName = path.basename(overrideFile).replace(/\.[^/.]+$/, '')
-    
+
     // For each overridable import, check if it matches our override file
     return overridableImports.some(({importPath, extension}) => {
         // Clean up the import path (remove ./ prefix if present)
         const cleanImportPath = importPath.replace(/^\.\//, '')
-        
+
         // Get the file name from the import path
         const importFileName = path.basename(cleanImportPath)
-        
+
         // Check if the file name matches
         const fileNameMatches = importFileName === fileName
-        
+
         // Check if the extension matches (if provided)
         const extensionMatches = extension ? extension.includes(extensionName) : false
-        
+
         // For extension imports, we need both the file name and extension to match
         // For non-extension imports, just the file name needs to match
-        return extension ? (fileNameMatches && extensionMatches) : fileNameMatches
+        return extension ? fileNameMatches && extensionMatches : fileNameMatches
     })
 }