feat(android): add codeConnectPackageName support for AndroidIconsEntry

Author: alexey1312

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+
+### Features
+
+- **android**: Add `codeConnectPackageName` to decouple Code Connect from Compose Extension generation
+
 ## [2.7.0] - 2026-02-28
 
 ### Features

CONFIG.md

@@ -636,23 +636,25 @@ icons = new Android.IconsEntry {
   composePackageName = "com.example"
   // composeFormat = "resourceReference"
   // composeExtensionTarget = "com.example.app.ui.AppIcons"
+  // codeConnectPackageName = "com.example"
   // codeConnectKotlin = "./main/src/java/com/example/Icons.figma.kt"
   // nameStyle = "snake_case"
   // pathPrecision = 4
   // strictPathValidation = false
 }
 ```
 
-| Field                    | Type                 | Required | Description                                                 |
-| ------------------------ | -------------------- | -------- | ----------------------------------------------------------- |
-| `output`                 | `String`             | Yes      | Output directory for vector drawables (relative to mainRes) |
-| `composePackageName`     | `String?`            | No       | Package for Compose icon code                               |
-| `composeFormat`          | `ComposeIconFormat?` | No       | `"resourceReference"` (default) or `"imageVector"`          |
-| `composeExtensionTarget` | `String?`            | No       | Extension target for ImageVector                            |
-| `nameStyle`              | `NameStyle?`         | No       | Name style for generated names                              |
-| `pathPrecision`          | `Int(1-6)?`          | No       | Coordinate precision for pathData (default: 4)              |
-| `strictPathValidation`   | `Boolean?`           | No       | Error on pathData > 32,767 bytes (default: false)           |
-| `codeConnectKotlin`      | `String?`            | No       | Path to generate Figma Code Connect Kotlin file             |
+| Field                    | Type                 | Required | Description                                                        |
+| ------------------------ | -------------------- | -------- | ------------------------------------------------------------------ |
+| `output`                 | `String`             | Yes      | Output directory for vector drawables (relative to mainRes)        |
+| `composePackageName`     | `String?`            | No       | Package for Compose icon code (also used as Code Connect fallback) |
+| `composeFormat`          | `ComposeIconFormat?` | No       | `"resourceReference"` (default) or `"imageVector"`                 |
+| `composeExtensionTarget` | `String?`            | No       | Extension target for ImageVector                                   |
+| `nameStyle`              | `NameStyle?`         | No       | Name style for generated names                                     |
+| `pathPrecision`          | `Int(1-6)?`          | No       | Coordinate precision for pathData (default: 4)                     |
+| `strictPathValidation`   | `Boolean?`           | No       | Error on pathData > 32,767 bytes (default: false)                  |
+| `codeConnectPackageName` | `String?`            | No       | Package for Code Connect only (overrides `composePackageName`)     |
+| `codeConnectKotlin`      | `String?`            | No       | Path to generate Figma Code Connect Kotlin file                    |
 
 **Inherited from `FrameSource`:** `figmaFrameName`, `figmaPageName`, `figmaFileId`, `rtlProperty`, `nameValidateRegexp`, `nameReplaceRegexp`.
 

Sources/ExFig-Android/Config/AndroidIconsEntry.swift

@@ -33,6 +33,11 @@ public extension Android.IconsEntry {
         return nameStyle.coreNameStyle
     }
 
+    /// Effective package name for Code Connect: prefers `codeConnectPackageName`, falls back to `composePackageName`.
+    var effectiveCodeConnectPackageName: String? {
+        codeConnectPackageName ?? composePackageName
+    }
+
     /// URL for Code Connect Kotlin file output.
     var codeConnectKotlinURL: URL? {
         codeConnectKotlin.map { URL(fileURLWithPath: $0) }

Sources/ExFig-Android/Export/AndroidIconsExporter.swift

@@ -172,8 +172,8 @@ private extension AndroidIconsExporter {
         context: some IconsExportContext
     ) throws -> FileContents? {
         guard let url = entry.codeConnectKotlinURL else { return nil }
-        guard let packageName = entry.composePackageName else {
-            context.warning("Code Connect skipped: 'composePackageName' is required")
+        guard let packageName = entry.effectiveCodeConnectPackageName else {
+            context.warning("Code Connect skipped: 'codeConnectPackageName' or 'composePackageName' is required")
             return nil
         }
         guard let resourcePackage = platformConfig.resourcePackage else {

Sources/ExFigCLI/Resources/Schemas/Android.pkl

@@ -120,6 +120,11 @@ class IconsEntry extends Common.FrameSource {
   /// If true, exit with error when pathData exceeds 32,767 bytes.
   strictPathValidation: Boolean?
 
+  /// Package name for Figma Code Connect Kotlin file.
+  /// Overrides composePackageName for Code Connect only.
+  /// Use this to generate .figma.kt without triggering Icons.kt.
+  codeConnectPackageName: String?
+
   /// Path to generate Figma Code Connect Kotlin file for Jetpack Compose.
   codeConnectKotlin: String?
 }

Sources/ExFigCLI/Resources/androidConfig.swift

@@ -127,6 +127,9 @@ android = new Android.AndroidConfig {
     // composeFormat = "resourceReference"
     // [optional] Extension target package for Compose icons
     // composeExtensionTarget = "androidx.compose.ui.graphics.vector.ImageVector"
+    // [optional] Package name for Code Connect only (overrides composePackageName for .figma.kt).
+    // Use this to generate Code Connect without triggering Icons.kt generation.
+    // codeConnectPackageName = "com.example"
     // [optional] Path to generate Figma Code Connect Kotlin file for Jetpack Compose
     // codeConnectKotlin = "./main/src/java/com/example/Icons.figma.kt"
   }

Sources/ExFigConfig/Generated/Android.pkl.swift

@@ -235,6 +235,11 @@ extension Android {
         /// If true, exit with error when pathData exceeds 32,767 bytes.
         public var strictPathValidation: Bool?
 
+        /// Package name for Figma Code Connect Kotlin file.
+        /// Overrides composePackageName for Code Connect only.
+        /// Use this to generate .figma.kt without triggering Icons.kt.
+        public var codeConnectPackageName: String?
+
         /// Path to generate Figma Code Connect Kotlin file for Jetpack Compose.
         public var codeConnectKotlin: String?
 
@@ -274,6 +279,7 @@ extension Android {
             nameStyle: Common.NameStyle?,
             pathPrecision: Int?,
             strictPathValidation: Bool?,
+            codeConnectPackageName: String?,
             codeConnectKotlin: String?,
             figmaFrameName: String?,
             figmaPageName: String?,
@@ -291,6 +297,7 @@ extension Android {
             self.nameStyle = nameStyle
             self.pathPrecision = pathPrecision
             self.strictPathValidation = strictPathValidation
+            self.codeConnectPackageName = codeConnectPackageName
             self.codeConnectKotlin = codeConnectKotlin
             self.figmaFrameName = figmaFrameName
             self.figmaPageName = figmaPageName

Tests/ExFigTests/Config/EntryOverrideResolutionTests.swift

@@ -118,6 +118,37 @@ final class AndroidEntryOverrideResolutionTests: XCTestCase {
         XCTAssertEqual(resolved, fallback)
     }
 
+    // MARK: - effectiveCodeConnectPackageName
+
+    func testIconsEntry_bothPackageNames_prefersCodeConnect() throws {
+        let entry = try makeAndroidIconsEntry(
+            composePackageName: "com.compose",
+            codeConnectPackageName: "com.codeconnect"
+        )
+
+        XCTAssertEqual(entry.effectiveCodeConnectPackageName, "com.codeconnect")
+    }
+
+    func testIconsEntry_onlyComposePackageName_fallsBack() throws {
+        let entry = try makeAndroidIconsEntry(composePackageName: "com.compose")
+
+        XCTAssertEqual(entry.effectiveCodeConnectPackageName, "com.compose")
+    }
+
+    func testIconsEntry_onlyCodeConnectPackageName_returnsIt() throws {
+        let entry = try makeAndroidIconsEntry(codeConnectPackageName: "com.codeconnect")
+
+        XCTAssertEqual(entry.effectiveCodeConnectPackageName, "com.codeconnect")
+    }
+
+    func testIconsEntry_bothNil_returnsNil() throws {
+        let entry = try makeAndroidIconsEntry()
+
+        XCTAssertNil(entry.effectiveCodeConnectPackageName)
+    }
+
+    // MARK: - ImagesEntry mainRes
+
     func testImagesEntry_mainResOverride_resolvesEntryValue() throws {
         let entry = try makeAndroidImagesEntry(mainRes: "/images/res")
         let fallback = URL(fileURLWithPath: "/default/res")
@@ -129,10 +160,16 @@ final class AndroidEntryOverrideResolutionTests: XCTestCase {
 
     // MARK: - Helpers
 
-    private func makeAndroidIconsEntry(mainRes: String? = nil) throws -> AndroidIconsEntry {
+    private func makeAndroidIconsEntry(
+        mainRes: String? = nil,
+        composePackageName: String? = nil,
+        codeConnectPackageName: String? = nil
+    ) throws -> AndroidIconsEntry {
         var fields = [String]()
         fields.append("\"output\": \"drawable\"")
         if let mainRes { fields.append("\"mainRes\": \"\(mainRes)\"") }
+        if let composePackageName { fields.append("\"composePackageName\": \"\(composePackageName)\"") }
+        if let codeConnectPackageName { fields.append("\"codeConnectPackageName\": \"\(codeConnectPackageName)\"") }
         let json = "{ \(fields.joined(separator: ", ")) }"
         return try JSONDecoder().decode(AndroidIconsEntry.self, from: Data(json.utf8))
     }

Tests/ExFigTests/Input/EnumBridgingTests.swift

@@ -191,6 +191,7 @@ final class EnumBridgingTests: XCTestCase {
                 nameStyle: pklStyle,
                 pathPrecision: nil,
                 strictPathValidation: nil,
+                codeConnectPackageName: nil,
                 codeConnectKotlin: nil,
                 figmaFrameName: nil,
                 figmaPageName: nil,
@@ -217,6 +218,7 @@ final class EnumBridgingTests: XCTestCase {
             nameStyle: nil,
             pathPrecision: nil,
             strictPathValidation: nil,
+            codeConnectPackageName: nil,
             codeConnectKotlin: nil,
             figmaFrameName: nil,
             figmaPageName: nil,