refactor(ui-codemods): add ui metapackage to icon codemod and simplif…

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/basic.input.tsx

@@ -1,12 +1,20 @@
 import React from 'react'
-import { IconA11yLine, IconAddLine, IconAdminLine } from '@instructure/ui-icons'
+import {
+  IconA11yLine,
+  IconAddLine,
+  IconAdminLine,
+  IconSearchLine,
+  IconAiSolid
+} from '@instructure/ui-icons'
 
 function MyComponent() {
   return (
     <div>
       <IconA11yLine />
       <IconAddLine />
       <IconAdminLine />
+      <IconSearchLine />
+      <IconAiSolid />
     </div>
   )
 }

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/basic.output.tsx

@@ -1,16 +1,20 @@
+import React from 'react'
 import {
   Accessibility2InstUIIcon,
   PlusInstUIIcon,
-  ShieldUserInstUIIcon
+  ShieldUserInstUIIcon,
+  SearchInstUIIcon,
+  IgniteaiLogoInstUIIcon
 } from '@instructure/ui-icons'
-import React from 'react'
 
 function MyComponent() {
   return (
     <div>
       <Accessibility2InstUIIcon />
       <PlusInstUIIcon />
       <ShieldUserInstUIIcon />
+      <SearchInstUIIcon />
+      <IgniteaiLogoInstUIIcon />
     </div>
   )
 }

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/metaPackage.input.tsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import {
+  Button,
+  IconSearchLine,
+  IconAddLine,
+  IconInfoLine,
+  Text
+} from '@instructure/ui'
+
+function MyComponent() {
+  return (
+    <div>
+      <Button renderIcon={<IconSearchLine />}>Click me</Button>
+      <Button renderIcon={IconInfoLine}>Info</Button>
+      <IconAddLine />
+      <Text>Hello</Text>
+    </div>
+  )
+}
+
+export default MyComponent

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/metaPackage.output.tsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import {
+  Button,
+  SearchInstUIIcon,
+  PlusInstUIIcon,
+  InfoInstUIIcon,
+  Text
+} from '@instructure/ui'
+
+function MyComponent() {
+  return (
+    <div>
+      <Button renderIcon={<SearchInstUIIcon />}>Click me</Button>
+      <Button renderIcon={InfoInstUIIcon}>Info</Button>
+      <PlusInstUIIcon />
+      <Text>Hello</Text>
+    </div>
+  )
+}
+
+export default MyComponent

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/unmapped.warning.output.json

@@ -1,3 +1,3 @@
 [
-  "No mapping found for icon: IconFakeIconThatDoesNotExistLine. Please migrate manually."
+  "No mapping found for \"IconFakeIconThatDoesNotExistLine\". Please migrate manually."
 ]

packages/ui-codemods/lib/__node_tests__/__testfixtures__/migrateToNewIcons/withAliases.output.tsx

@@ -1,10 +1,10 @@
-import { Accessibility2InstUIIcon } from '@instructure/ui-icons'
 import React from 'react'
+import { Accessibility2InstUIIcon as A11yIcon } from '@instructure/ui-icons'
 
 function MyComponent() {
   return (
     <div>
-      <Accessibility2InstUIIcon />
+      <A11yIcon />
     </div>
   )
 }

packages/ui-codemods/lib/migrateToNewIcons.ts

@@ -22,144 +22,108 @@
  * SOFTWARE.
  */
 
-import type { Transform } from 'jscodeshift'
+import type { Collection, JSCodeshift, Transform } from 'jscodeshift'
 import type { InstUICodemod } from './utils/instUICodemodExecutor'
 import instUICodemodExecutor from './utils/instUICodemodExecutor'
-import { printWarning } from './utils/codemodHelpers'
-import { isImportSpecifier } from './utils/codemodTypeCheckers'
+import {
+  findEveryImport,
+  printWarning,
+  renameImportAndUsages
+} from './utils/codemodHelpers'
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
+const IMPORT_PATHS = [
+  '@instructure/ui-icons',
+  '@instructure/ui-icons/es/svg',
+  '@instructure/ui'
+]
+
 const mappingData = JSON.parse(
   fs.readFileSync(
     path.join(__dirname, '../../ui-icons/src/lucide/mapping.json'),
     'utf-8'
   )
 )
-const iconMapping = mappingData.mappingOverrides as Record<string, string>
 
-const ICON_IMPORT_PATHS = [
-  '@instructure/ui-icons',
-  '@instructure/ui-icons/es/svg'
-]
-const NEW_ICON_IMPORT_PATH = '@instructure/ui-icons'
+const iconMappings = mappingData.mappingOverrides as Record<string, string>
 
-/**
- * Convert kebab-case to PascalCase.
- * Example: 'accessibility-2' -> 'Accessibility2'
- */
 function kebabToPascal(str: string): string {
   return str
     .split('-')
     .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
     .join('')
 }
 
+const LEGACY_ICON_PATTERN = /^Icon(.+?)(Line|Solid)$/
+
 /**
- * Returns the new icon export name for the given legacy icon name,
- * or null if no mapping exists.
- * Example: 'IconA11yLine' -> 'Accessibility2InstUIIcon'
+ * Warns about legacy icons that has no mappings and have to be migrated manually
  */
-function getNewIconName(oldName: string): string | null {
-  const match = oldName.match(/^Icon(.+?)(Line|Solid)$/)
-  if (!match) return null
-  const mappedName = iconMapping[match[1]]
-  if (!mappedName) return null
-  return kebabToPascal(mappedName) + 'InstUIIcon'
+function warnUnmappedIcons(
+  j: JSCodeshift,
+  root: Collection,
+  filePath: string
+): void {
+  // findEveryImport only accepts a single path, so flatMap collects results across all paths
+  IMPORT_PATHS.flatMap((p) => findEveryImport(j, root, p)).forEach(
+    (localName) => {
+      const match = localName.match(LEGACY_ICON_PATTERN)
+      if (!match || iconMappings[match[1]]) return
+
+      printWarning(
+        filePath,
+        undefined,
+        `No mapping found for "${localName}". Please migrate manually.`
+      )
+    }
+  )
 }
 
 /**
- * Migrates from legacy InstUI icons to new lucide and custom icons
+ * Iterates every known legacy icon name (derived from mapping.json) and migrates it:
+ * 1. Renames the import specifier in-place
+ * 2. Renames JSX elements
+ * 3. Renames references (`renderIcon={OldIcon}`).
  */
-const migrateToNewIcons: Transform = (
-  file,
-  api,
-  options?: { fileName?: string; usePrettier?: boolean }
-) => {
-  return instUICodemodExecutor(migrateToNewIconsCodemod, file, api, options)
-}
+function migrateIcons(j: JSCodeshift, root: Collection): boolean {
+  let didChange = false
 
-const migrateToNewIconsCodemod: InstUICodemod = (j, root, filePath) => {
-  let hasModifications = false
-  const newIconNames = new Set<string>()
-  // localIconName -> newIconName (handles aliased imports like `import { A as B }`)
-  const replacements = new Map<string, string>()
-
-  root.find(j.ImportDeclaration).forEach((path) => {
-    if (!ICON_IMPORT_PATHS.includes(path.node.source.value as string)) return
+  for (const [iconSuffix, newIconKey] of Object.entries(iconMappings)) {
+    const newName = kebabToPascal(newIconKey) + 'InstUIIcon'
 
-    const remainingSpecifiers: typeof path.node.specifiers = []
-
-    path.node.specifiers?.forEach((spec) => {
-      if (!isImportSpecifier(spec)) {
-        remainingSpecifiers.push(spec)
-        return
-      }
+    for (const variant of ['Line', 'Solid']) {
+      const legacyName = `Icon${iconSuffix}${variant}`
 
-      const oldIconName = spec.imported.name as string
-      const localIconName = (spec.local?.name as string) ?? oldIconName
-      const newIconName = getNewIconName(oldIconName)
-
-      if (!newIconName) {
-        remainingSpecifiers.push(spec)
-        printWarning(
-          filePath,
-          spec.loc?.start.line,
-          `No mapping found for icon: ${oldIconName}. Please migrate manually.`
-        )
-        return
+      if (renameImportAndUsages(j, root, legacyName, newName, IMPORT_PATHS)) {
+        didChange = true
       }
-
-      replacements.set(localIconName, newIconName)
-      newIconNames.add(newIconName)
-      hasModifications = true
-    })
-
-    if (remainingSpecifiers.length === 0) {
-      j(path).remove()
-    } else {
-      // eslint-disable-next-line no-param-reassign
-      path.node.specifiers = remainingSpecifiers
     }
-  })
-
-  if (!hasModifications) return false
-
-  // Rename JSX usages
-  root.find(j.JSXElement).forEach((path) => {
-    const opening = path.node.openingElement
-    const closing = path.node.closingElement
-    if (opening.name.type !== 'JSXIdentifier') return
+  }
 
-    const newName = replacements.get(opening.name.name)
-    if (!newName) return
+  return didChange
+}
 
-    opening.name.name = newName
-    if (closing?.name.type === 'JSXIdentifier') {
-      closing.name.name = newName
-    }
-  })
-
-  // Add new import at the top, sorted alphabetically
-  const specifiers = Array.from(newIconNames)
-    .sort()
-    .map((name) => j.importSpecifier(j.identifier(name), j.identifier(name)))
-  const newImport = j.importDeclaration(
-    specifiers,
-    j.literal(NEW_ICON_IMPORT_PATH)
-  )
-  const firstImport = root.find(j.ImportDeclaration).at(0)
-  if (firstImport.length > 0) {
-    firstImport.insertBefore(newImport)
-  } else {
-    root.get().node.program.body.unshift(newImport)
-  }
+/**
+ * Migrates legacy InstUI icons (`IconXxxLine` / `IconXxxSolid`) to new
+ * `XxxInstUIIcon` components.
+ *
+ * Renames specifiers in-place for imports from:
+ *   - `@instructure/ui-icons`
+ *   - `@instructure/ui-icons/es/svg`
+ *   - `@instructure/ui`
+ */
+const migrateToNewIconsCodemod: InstUICodemod = (j, root, filePath) => {
+  warnUnmappedIcons(j, root, filePath)
+  return migrateIcons(j, root)
+}
 
-  return true
+const migrateToNewIcons: Transform = (file, api, options) => {
+  return instUICodemodExecutor(migrateToNewIconsCodemod, file, api, options)
 }
 
 export default migrateToNewIcons

packages/ui-codemods/lib/utils/codemodHelpers.ts

@@ -516,13 +516,17 @@ function addImportIfNeeded(
  * import { oldName as localName } from "@import-path"
  * oldName()
  * localName()
+ * <oldName />
+ * <localName />
  * ```
  * with
  * ```
  * import { newName } from "@import-path"
  * import { newName as localName } from "@import-path"
  * newName()
  * localName()
+ * <newName />
+ * <localName />
  * ```
  *
  * @param j - jscodeshift API
@@ -553,19 +557,19 @@ function renameImportAndUsages(
         // eslint-disable-next-line no-param-reassign
         specifier.imported.name = newName
 
-      // Rename usages if no alias (no 'as' syntax)
-      if (!specifier.local || specifier.local.name === oldName) {
-        const localName = specifier.local ? specifier.local.name : oldName
+        // Rename usages if no alias (no 'as' syntax)
+        if (!specifier.local || specifier.local.name === oldName) {
+          const localName = specifier.local ? specifier.local.name : oldName
 
-        root
-          .find(j.Identifier, { name: localName as string})
-          .forEach((idPath) => {
-            // Make sure this identifier is not inside import declaration
-            if (idPath.parentPath.node.type !== 'ImportSpecifier') {
-              // eslint-disable-next-line no-param-reassign
-              idPath.node.name = newName
-            }
-          })
+          root
+            .find(j.Identifier, { name: localName as string })
+            .forEach((idPath) => {
+              // Make sure this identifier is not inside import declaration
+              if (idPath.parentPath.node.type !== 'ImportSpecifier') {
+                // eslint-disable-next-line no-param-reassign
+                idPath.node.name = newName
+              }
+            })
         }
 
         didRename = true