gfgf

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -801,8 +801,6 @@ struct StackCodegen {
         switch elementType {
         case .jsObject(let className?) where className != "JSObject":
             return liftArrayExpressionInline(elementType: elementType)
-        case .swiftProtocol(let protocolName):
-            return "[Any\(raw: protocolName)].bridgeJSLiftParameter()"
         case .nullable, .closure:
             return liftArrayExpressionInline(elementType: elementType)
         case .void, .namespaceEnum:
@@ -838,13 +836,6 @@ struct StackCodegen {
                     return __dict.mapValues { \(raw: className)(unsafelyWrapping: $0) }
                 }()
                 """
-        case .swiftProtocol(let protocolName):
-            return """
-                {
-                    let __dict = [String: JSObject].bridgeJSLiftParameter()
-                    return __dict.mapValues { $0 as! Any\(raw: protocolName) }
-                }()
-                """
         case .nullable, .closure:
             return liftDictionaryExpressionInline(valueType: valueType)
         case .void, .namespaceEnum:
@@ -898,19 +889,14 @@ struct StackCodegen {
         varPrefix: String
     ) -> [CodeBlockItemSyntax] {
         switch type {
-        case .string, .int, .uint, .bool, .float, .double, .jsValue:
-            return ["\(raw: accessor).bridgeJSLowerStackReturn()"]
-        case .jsObject(nil):
+        case .string, .int, .uint, .bool, .float, .double, .jsValue,
+            .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure,
+            .caseEnum, .rawValueEnum:
             return ["\(raw: accessor).bridgeJSLowerStackReturn()"]
         case .jsObject(_?):
             return ["\(raw: accessor).jsObject.bridgeJSLowerStackReturn()"]
-        case .swiftHeapObject, .unsafePointer, .closure:
-            return ["\(raw: accessor).bridgeJSLowerStackReturn()"]
-        case .swiftProtocol(let protocolName):
-            let wrapperName = "Any\(protocolName)"
-            return ["(\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerStackReturn()"]
-        case .caseEnum, .rawValueEnum:
-            return ["\(raw: accessor).bridgeJSLowerStackReturn()"]
+        case .swiftProtocol:
+            return ["(\(raw: accessor) as! \(raw: type.swiftType)).bridgeJSLowerStackReturn()"]
         case .associatedValueEnum, .swiftStruct:
             return ["\(raw: accessor).bridgeJSLowerReturn()"]
         case .nullable(let wrappedType, _):
@@ -932,8 +918,8 @@ struct StackCodegen {
         switch elementType {
         case .jsObject(let className?) where className != "JSObject":
             return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"]
-        case .swiftProtocol(let protocolName):
-            return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"]
+        case .swiftProtocol:
+            return ["\(raw: accessor).map { $0 as! \(raw: elementType.swiftType) }.bridgeJSLowerReturn()"]
         case .nullable, .closure:
             return lowerArrayStatementsInline(
                 elementType: elementType,
@@ -979,8 +965,8 @@ struct StackCodegen {
         switch valueType {
         case .jsObject(let className?) where className != "JSObject":
             return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSLowerReturn()"]
-        case .swiftProtocol(let protocolName):
-            return ["\(raw: accessor).mapValues { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"]
+        case .swiftProtocol:
+            return ["\(raw: accessor).mapValues { $0 as! \(raw: valueType.swiftType) }.bridgeJSLowerReturn()"]
         case .nullable, .closure:
             return lowerDictionaryStatementsInline(
                 valueType: valueType,

Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift

@@ -2198,7 +2198,7 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum {
         case 2:
             return .jsObjectPayload(JSObject.bridgeJSLiftParameter())
         case 3:
-            return .nestedEnum(APIResult.bridgeJSLiftParameter(_swift_js_pop_i32()))
+            return .nestedEnum(APIResult.bridgeJSLiftParameter())
         case 4:
             return .arrayPayload([Int].bridgeJSLiftParameter())
         case 5:
@@ -2240,9 +2240,9 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum {
     @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult {
         switch caseId {
         case 0:
-            return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32()))
+            return .precision(Precision.bridgeJSLiftParameter())
         case 1:
-            return .direction(Direction.bridgeJSLiftParameter(_swift_js_pop_i32()))
+            return .direction(Direction.bridgeJSLiftParameter())
         case 2:
             return .optPrecision(Optional<Precision>.bridgeJSLiftParameter())
         case 3:
@@ -2992,7 +2992,7 @@ fileprivate func _bjs_struct_lift_Contact() -> Int32 {
 
 extension Config: _BridgedSwiftStruct {
     @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config {
-        let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32())
+        let status = Status.bridgeJSLiftParameter()
         let direction = Optional<Direction>.bridgeJSLiftParameter()
         let theme = Optional<Theme>.bridgeJSLiftParameter()
         let name = String.bridgeJSLiftParameter()
@@ -3100,7 +3100,7 @@ extension ValidationReport: _BridgedSwiftStruct {
     @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport {
         let outcome = Optional<APIResult>.bridgeJSLiftParameter()
         let status = Optional<Status>.bridgeJSLiftParameter()
-        let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_i32())
+        let result = APIResult.bridgeJSLiftParameter()
         let id = Int.bridgeJSLiftParameter()
         return ValidationReport(id: id, result: result, status: status, outcome: outcome)
     }
@@ -3160,8 +3160,8 @@ extension AdvancedConfig: _BridgedSwiftStruct {
         let location = Optional<DataPoint>.bridgeJSLiftParameter()
         let metadata = Optional<JSObject>.bridgeJSLiftParameter()
         let result = Optional<APIResult>.bridgeJSLiftParameter()
-        let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32())
-        let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())
+        let status = Status.bridgeJSLiftParameter()
+        let theme = Theme.bridgeJSLiftParameter()
         let enabled = Bool.bridgeJSLiftParameter()
         let title = String.bridgeJSLiftParameter()
         let id = Int.bridgeJSLiftParameter()
@@ -3226,8 +3226,8 @@ extension MeasurementConfig: _BridgedSwiftStruct {
     @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig {
         let optionalRatio = Optional<Ratio>.bridgeJSLiftParameter()
         let optionalPrecision = Optional<Precision>.bridgeJSLiftParameter()
-        let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_f64())
-        let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32())
+        let ratio = Ratio.bridgeJSLiftParameter()
+        let precision = Precision.bridgeJSLiftParameter()
         return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio)
     }