Improve removal script performance (#892)

Cleanup

Author: nickromano

ios/remove-unused-fluent-icons/README.md

@@ -14,6 +14,10 @@ xed .
 
 Build the binary and commit it to the repo
 
+```
+cd ios/remove-unused-fluent-icons
+```
+
 ```
 swift build -c release
 yes | cp .build/release/remove-unused-fluent-icons run

ios/remove-unused-fluent-icons/Sources/RemoveUnusedIcons/Grep.swift

@@ -30,16 +30,16 @@ enum Language {
   case objc
 }
 
-func searchForCodeReferences(in path: String, language: Language, weights: Set<String>, excludingFileName: String) -> [String] {
+func searchForCodeReferences(in path: String, language: Language, weights: Set<String>, excludingFileName: String) -> Set<String> {
   let include: String
-  let regex: String
+  let regexPattern: String
   switch language {
   case .swift:
     include = "--include=\"*.swift\""
-    regex = "\\.[a-zA-Z0-9]+[0-9]{2}(\(weights.map { $0.capitalized }.joined(separator: "|")))"
+    regexPattern = "\\.([a-zA-Z0-9]+[0-9]{2}(\(weights.map { $0.capitalized }.joined(separator: "|"))))"
   case .objc:
     include = "--include=\"*.m\" --include=\"*.h\""
-    regex = "\(excludingFileName)[a-zA-Z0-9]+[0-9]{2}(\(weights.map { $0.uppercased() }.joined(separator: "|")))"
+    regexPattern = "(\(excludingFileName)[a-zA-Z0-9]+[0-9]{2}(\(weights.map { $0.uppercased() }.joined(separator: "|"))))"
   }
 
   // Newer versions of grep (on macOS 12+) appear to apply the include/exclude arguments in order, so exclude must come last
@@ -50,9 +50,29 @@ func searchForCodeReferences(in path: String, language: Language, weights: Set<S
     --extended-regexp \
     \(include) \
     --exclude=\"\(excludingFileName).swift\" \
-    \"\(regex)\" \(path)
+    \"\(regexPattern)\" \(path)
   """
+
   print(command)
 
-  return shell(command).mapToLines()
+  let regex: NSRegularExpression
+  do {
+    regex = try NSRegularExpression(pattern: regexPattern, options: [])
+  } catch {
+    fatalError("Invalid regex pattern: \(error) \(regexPattern)")
+  }
+
+  let text = shell(command)
+
+  // The grep command returns the full line of code so we need to extract the icon names from each line
+  var output = Set<String>()
+  let matches = regex.matches(in: text, options: [], range: NSRange(location: 0, length: text.utf16.count))
+  for match in matches {
+    let groupRange = match.range(at: 1)
+    if groupRange.location != NSNotFound,
+        let range = Range(groupRange, in: text) {
+      output.insert(String(text[range]))
+    }
+  }
+  return output
 }

ios/remove-unused-fluent-icons/Sources/RemoveUnusedIcons/RemoveUnusedIcons.swift

@@ -33,61 +33,45 @@ public func removeUnusedAssets(libraryName: String, assetCatalogName: String, pa
   var fileName = libraryName
   _ = fileName.removeLast() // Remove trailing "s"
 
-  let result = try getAllIconNames(pathToFluentIconSource: pathToFluentIconSource, libraryName: libraryName, fileName: fileName)
+  let (allIconNames, weights) = try getAllIconNames(pathToFluentIconSource: pathToFluentIconSource, libraryName: libraryName, fileName: fileName)
 
   print("Searching for possible swift icon references")
   let allPossibleSwiftIconReferences = searchForCodeReferences(
     in: pathToSourceCode,
     language: .swift,
-    weights: result.weights,
+    weights: weights,
     excludingFileName: fileName
   )
 
   print("Searching for possible objc icon references")
   let allPossibleObjcIconReferences = searchForCodeReferences(
     in: pathToSourceCode,
     language: .objc,
-    weights: result.weights,
+    weights: weights,
     excludingFileName: fileName
   )
 
-  var listOfIconsToKeep: [String] = []
+  var listOfIconsToKeep = Set<String>()
   if let pathToListOfIconsToKeep = pathToListOfIconsToKeep {
     for path in pathToListOfIconsToKeep.split(separator: ",") {
       let fileContents = try String(contentsOfFile: String(path), encoding: .utf8)
-      listOfIconsToKeep.append(contentsOf: fileContents.mapToLines())
+      for line in fileContents.mapToLines() {
+        listOfIconsToKeep.insert(line)
+      }
     }
   }
 
-  let allPossibleIconReferences = allPossibleSwiftIconReferences + allPossibleObjcIconReferences + listOfIconsToKeep
-
-  let allIconNames = result.names
-
   // Validate custom list provided to script has all valid icons
-  var invalidIcons: [String] = []
-  for icon in listOfIconsToKeep {
-    if !allIconNames.contains(icon) {
-      invalidIcons.append(icon)
-    }
-  }
+  let invalidIcons = listOfIconsToKeep.subtracting(allIconNames)
   if !invalidIcons.isEmpty {
     print("List of icons provided contains invalid icons \(invalidIcons)")
     if exitOnIncorrectlyUsedIconName {
       exit(1)
     }
   }
 
-  let allPossibleIconReferencesLower = allPossibleIconReferences.map { $0.lowercased() }
-  let allIconNamesLower = Set(allIconNames.map { $0.lowercased() })
-
-  var iconsUsed = Set<String>()
-  for line in allPossibleIconReferencesLower {
-    for iconName in allIconNamesLower {
-      if line.contains(iconName) {
-        iconsUsed.insert(iconName)
-      }
-    }
-  }
+  print("Finding used icons")
+  let allUsedIcons = allPossibleSwiftIconReferences.union(allPossibleObjcIconReferences).union(listOfIconsToKeep)
 
   let pathToFluentIconAssets = "\(pathToFluentIconSource)/ios/\(libraryName)/Assets/\(assetCatalogName).xcassets"
 
@@ -100,13 +84,13 @@ public func removeUnusedAssets(libraryName: String, assetCatalogName: String, pa
   }
 
   print("Removing unused assets")
-  var count = 0
+  var removedCount = 0
   for directory in directories {
-    let iconName = getIconName(from: directory).lowercased()
-    if !iconsUsed.contains(iconName) {
+    let iconName = getIconName(from: directory)
+    if !allUsedIcons.contains(iconName) {
       try FileManager.default.removeItem(at: directory)
-      count += 1
+      removedCount += 1
     }
   }
-  print("Removed \(count) unused assets.")
+  print("Removed \(removedCount)")
 }