BridgeJS: Add importParams, NilSentinel, sentinel-based optional lowering, and collapse liftExpression

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -717,13 +717,8 @@ struct StackCodegen {
     /// - Returns: An ExprSyntax representing the lift expression
     func liftExpression(for type: BridgeType) -> ExprSyntax {
         switch type {
-        case .string, .int, .uint, .bool, .float, .double,
-            .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer,
-            .swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum:
-            return "\(raw: type.swiftType).bridgeJSLiftParameter()"
         case .jsObject(let className?):
             return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSLiftParameter())"
-
         case .nullable(let wrappedType, let kind):
             return liftNullableExpression(wrappedType: wrappedType, kind: kind)
         case .array(let elementType):
@@ -734,6 +729,8 @@ struct StackCodegen {
             return "JSObject.bridgeJSLiftParameter()"
         case .void, .namespaceEnum:
             return "()"
+        default:
+            return "\(raw: type.swiftType).bridgeJSLiftParameter()"
         }
     }
 
@@ -804,14 +801,10 @@ struct StackCodegen {
     private func liftNullableExpression(wrappedType: BridgeType, kind: JSOptionalKind) -> ExprSyntax {
         let typeName = kind == .null ? "Optional" : "JSUndefinedOr"
         switch wrappedType {
-        case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue,
-            .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum,
-            .array, .dictionary:
-            return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()"
-        case .jsObject(let className?):
+        case .jsObject(let className?) where className != "JSObject":
             return "\(raw: typeName)<JSObject>.bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }"
-        case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol:
-            fatalError("Invalid nullable wrapped type: \(wrappedType)")
+        default:
+            return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()"
         }
     }
 

Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift

@@ -714,25 +714,10 @@ extension BridgeType {
             }
             fallthrough
         default:
-            return try loweringParameterInfoForNonOptional(context: context)
+            return LoweringParameterInfo(loweredParameters: descriptor.importParams)
         }
     }
 
-    private func loweringParameterInfoForNonOptional(context: BridgeContext) throws -> LoweringParameterInfo {
-        switch self {
-        case .swiftStruct where context == .importTS:
-            return LoweringParameterInfo(loweredParameters: [("objectId", .i32)])
-        case .string:
-            return LoweringParameterInfo(loweredParameters: [("value", .i32)])
-        case .rawValueEnum(_, .string):
-            return LoweringParameterInfo(loweredParameters: [("value", .i32)])
-        default:
-            break
-        }
-
-        return LoweringParameterInfo(loweredParameters: descriptor.wasmParams)
-    }
-
     struct LiftingReturnInfo {
         let valueToLift: WasmCoreType?
     }
@@ -754,20 +739,8 @@ extension BridgeType {
             }
             fallthrough
         default:
-            return liftingReturnInfoForNonOptional(context: context)
-        }
-    }
-
-    private func liftingReturnInfoForNonOptional(context: BridgeContext) -> LiftingReturnInfo {
-        if context == .importTS {
-            switch self {
-            case .swiftStruct:
-                return LiftingReturnInfo(valueToLift: .i32)
-            default:
-                break
-            }
+            return LiftingReturnInfo(valueToLift: descriptor.importReturnType)
         }
-        return LiftingReturnInfo(valueToLift: descriptor.importReturnType)
     }
 }
 

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -1534,15 +1534,7 @@ public struct BridgeJSLink {
         let enumValuesName = enumDefinition.valuesName
 
         switch enumDefinition.enumType {
-        case .simple:
-            let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
-            _ = try fragment.printCode([enumValuesName], context)
-            jsTopLevelLines.append(contentsOf: printer.lines)
-        case .rawValue:
-            guard enumDefinition.rawType != nil else {
-                throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType")
-            }
-
+        case .simple, .rawValue:
             let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
             _ = try fragment.printCode([enumValuesName], context)
             jsTopLevelLines.append(contentsOf: printer.lines)