feat: Expanding ${arch} macro for mac.binaries in case of unpacked files within universal builds (#9263)

Author: bimusiek

.changeset/flat-pets-grab.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+feat: Expanding `${arch}` macro properly for `mac.binaries` in case of native node packages for unpacked files for macos `universal` target

packages/app-builder-lib/src/macPackager.ts

@@ -21,6 +21,7 @@ import { createCommonTarget, NoOpTarget } from "./targets/targetFactory"
 import { isMacOsHighSierra } from "./util/macosVersion"
 import { getTemplatePath } from "./util/pathManager"
 import { resolveFunction } from "./util/resolve"
+import { expandMacro as doExpandMacro } from "./util/macroExpander"
 
 export type CustomMacSignOptions = SignOptions
 export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise<void>
@@ -69,6 +70,15 @@ export class MacPackager extends PlatformPackager<MacConfiguration> {
     return this.info.framework.macOsDefaultTargets
   }
 
+  expandArch(pattern: string, arch?: Arch | null): string[] {
+    if (arch === Arch.universal) {
+      // Universal build has `app-x64.asar.unpacked` & `app-arm64.asar.unpacked`
+      return [doExpandMacro(pattern, Arch[Arch.arm64], this.appInfo, {}, false), doExpandMacro(pattern, Arch[Arch.x64], this.appInfo, {}, false)]
+    }
+    // Every other build keeps the name as `app.asar.unpacked`
+    return [doExpandMacro(pattern, null, this.appInfo, {}, false)]
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   protected prepareAppInfo(appInfo: AppInfo): AppInfo {
     // codesign requires the filename to be normalized to the NFD form
@@ -303,15 +313,22 @@ export class MacPackager extends PlatformPackager<MacConfiguration> {
     let binaries = options.binaries || undefined
     if (binaries) {
       // Accept absolute paths for external binaries, else resolve relative paths from the artifact's app Contents path.
-      binaries = await Promise.all(
-        binaries.map(async destination => {
-          if (await statOrNull(destination)) {
-            return destination
-          }
-          return path.resolve(appPath, destination)
-        })
-      )
-      log.info({ binaries }, "signing additional user-defined binaries")
+      binaries = (
+        await Promise.all(
+          binaries.flatMap(async destination => {
+            const expandedDestination = this.expandArch(destination, arch)
+            return await Promise.all(
+              expandedDestination.map(async d => {
+                if (await statOrNull(d)) {
+                  return d
+                }
+                return path.resolve(appPath, d)
+              })
+            )
+          })
+        )
+      ).flat()
+      log.info({ binaries, arch: arch == null ? null : Arch[arch] }, "signing additional user-defined binaries for arch")
     }
     const customSignOptions: MasConfiguration | MacConfiguration = (isMas ? masOptions : this.platformSpecificBuildOptions) || this.platformSpecificBuildOptions