BridgeJS: Eliminate dead innerCleanup variables in nullable codegen and fix em-dashes

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -1957,19 +1957,28 @@ struct IntrinsicJSFragment: Sendable {
                 printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));")
 
                 let localCleanup = CodeFragmentPrinter()
-                let innerCleanupVar = scope.variable("innerCleanup")
-                printer.write("let \(innerCleanupVar);")
-                printer.write("if (\(isSomeVar)) {")
-                try printer.indent {
+                let ifBodyPrinter = CodeFragmentPrinter()
+                try ifBodyPrinter.indent {
                     let innerFragment = try stackLowerFragment(elementType: wrappedType)
                     let _ = try innerFragment.printCode(
                         [value],
-                        context.with(\.cleanupCode, localCleanup)
+                        context.with(\.printer, ifBodyPrinter).with(\.cleanupCode, localCleanup)
                     )
-                    let cleanupLines = localCleanup.lines.filter {
-                        !$0.trimmingCharacters(in: .whitespaces).isEmpty
-                    }
-                    if !cleanupLines.isEmpty {
+                }
+                let cleanupLines = localCleanup.lines.filter {
+                    !$0.trimmingCharacters(in: .whitespaces).isEmpty
+                }
+                let hasCleanup = !cleanupLines.isEmpty
+                let innerCleanupVar = hasCleanup ? scope.variable("innerCleanup") : nil
+                if let innerCleanupVar {
+                    printer.write("let \(innerCleanupVar);")
+                }
+                printer.write("if (\(isSomeVar)) {")
+                for line in ifBodyPrinter.lines {
+                    printer.write(line)
+                }
+                if let innerCleanupVar {
+                    printer.indent {
                         printer.write("\(innerCleanupVar) = () => {")
                         printer.indent {
                             for line in cleanupLines {
@@ -1997,7 +2006,9 @@ struct IntrinsicJSFragment: Sendable {
                     printer.write("}")
                 }
                 scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer)
-                cleanup.write("if (\(innerCleanupVar)) { \(innerCleanupVar)(); }")
+                if let innerCleanupVar {
+                    cleanup.write("if (\(innerCleanupVar)) { \(innerCleanupVar)(); }")
+                }
 
                 return []
             }
@@ -2855,23 +2866,32 @@ struct IntrinsicJSFragment: Sendable {
                     printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));")
 
                     let localCleanup = CodeFragmentPrinter()
-                    let innerCleanupVar = scope.variable("innerCleanup")
-                    printer.write("let \(innerCleanupVar);")
-                    printer.write("if (\(isSomeVar)) {")
-                    try printer.indent {
+                    let ifBodyPrinter = CodeFragmentPrinter()
+                    try ifBodyPrinter.indent {
                         let innerFragment = try structFieldLowerFragment(
                             type: wrappedType,
                             fieldName: fieldName,
                             allStructs: allStructs
                         )
                         let _ = try innerFragment.printCode(
                             [value],
-                            context.with(\.cleanupCode, localCleanup)
+                            context.with(\.printer, ifBodyPrinter).with(\.cleanupCode, localCleanup)
                         )
-                        let cleanupLines = localCleanup.lines.filter {
-                            !$0.trimmingCharacters(in: .whitespaces).isEmpty
-                        }
-                        if !cleanupLines.isEmpty {
+                    }
+                    let cleanupLines = localCleanup.lines.filter {
+                        !$0.trimmingCharacters(in: .whitespaces).isEmpty
+                    }
+                    let hasCleanup = !cleanupLines.isEmpty
+                    let innerCleanupVar = hasCleanup ? scope.variable("innerCleanup") : nil
+                    if let innerCleanupVar {
+                        printer.write("let \(innerCleanupVar);")
+                    }
+                    printer.write("if (\(isSomeVar)) {")
+                    for line in ifBodyPrinter.lines {
+                        printer.write(line)
+                    }
+                    if let innerCleanupVar {
+                        printer.indent {
                             printer.write("\(innerCleanupVar) = () => {")
                             printer.indent {
                                 for line in cleanupLines {
@@ -2899,7 +2919,9 @@ struct IntrinsicJSFragment: Sendable {
                         printer.write("}")
                     }
                     scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer)
-                    cleanup.write("if (\(innerCleanupVar)) { \(innerCleanupVar)(); }")
+                    if let innerCleanupVar {
+                        cleanup.write("if (\(innerCleanupVar)) { \(innerCleanupVar)(); }")
+                    }
                     return []
                 }
             )

Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift

@@ -269,7 +269,7 @@ public struct BridgeTypeDescriptor: Sendable {
 
 /// Describes how to transform a Swift accessor expression before passing it to bridge methods.
 ///
-/// Most types use `.identity` — the value is passed as-is. Two patterns require transformation:
+/// Most types use `.identity` - the value is passed as-is. Two patterns require transformation:
 /// - `@JSClass` types expose their underlying `JSObject` via a `.jsObject` member.
 /// - `@JS protocol` wrapper types require a downcast from the existential to the concrete wrapper.
 ///
@@ -322,9 +322,9 @@ public enum AccessorTransform: Sendable, Equatable {
 
 /// Which bridge protocol method the codegen calls to lower a value in the export direction.
 public enum LowerMethod: Sendable, Equatable {
-    /// Calls `bridgeJSLowerStackReturn()` — pushes a scalar onto the stack (used within composites like optionals, struct fields).
+    /// Calls `bridgeJSLowerStackReturn()` - pushes a scalar onto the stack (used within composites like optionals, struct fields).
     case stackReturn
-    /// Calls `bridgeJSLowerReturn()` — serializes the entire value onto the stack (struct, array, dictionary).
+    /// Calls `bridgeJSLowerReturn()` - serializes the entire value onto the stack (struct, array, dictionary).
     case fullReturn
     /// Calls `bridgeJSLowerParameter()` and pushes the i32 result. Used by associated value enums (tag + stack payload).
     case pushParameter

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js

@@ -740,31 +740,25 @@ export async function createInstantiator(options, swift) {
                     }
                     case OptionalAllTypesResultValues.Tag.OptClass: {
                         const isSome = value.param0 != null;
-                        let innerCleanup;
                         if (isSome) {
                             ptrStack.push(value.param0.pointer);
                         } else {
                             ptrStack.push(0);
                         }
                         i32Stack.push(isSome ? 1 : 0);
-                        const cleanup = () => {
-                            if (innerCleanup) { innerCleanup(); }
-                        };
+                        const cleanup = undefined;
                         return { caseId: OptionalAllTypesResultValues.Tag.OptClass, cleanup };
                     }
                     case OptionalAllTypesResultValues.Tag.OptJSObject: {
                         const isSome = value.param0 != null;
-                        let innerCleanup;
                         if (isSome) {
                             const objId = swift.memory.retain(value.param0);
                             i32Stack.push(objId);
                         } else {
                             i32Stack.push(0);
                         }
                         i32Stack.push(isSome ? 1 : 0);
-                        const cleanup = () => {
-                            if (innerCleanup) { innerCleanup(); }
-                        };
+                        const cleanup = undefined;
                         return { caseId: OptionalAllTypesResultValues.Tag.OptJSObject, cleanup };
                     }
                     case OptionalAllTypesResultValues.Tag.OptNestedEnum: {