Skip to content

BridgeJS: Remove _BridgedSwiftDictionaryStackType protocol #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 1 commit into from
Feb 27, 2026
+14 −25
Merged

BridgeJS: Remove _BridgedSwiftDictionaryStackType protocol #684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions Sources/JavaScriptKit/BridgeJSIntrinsics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,25 +1920,9 @@ extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, E

// MARK: - Dictionary Support

public protocol _BridgedSwiftDictionaryStackType: _BridgedSwiftTypeLoweredIntoVoidType,
_BridgedSwiftStackType
where StackLiftResult == Self {
associatedtype DictionaryValue: _BridgedSwiftStackType
where DictionaryValue.StackLiftResult == DictionaryValue
}

extension Dictionary: _BridgedSwiftStackType
where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
public typealias StackLiftResult = [String: Value]
// Lowering/return use stack-based encoding, so dictionary also behaves like a void-lowered type.
// Optional/JSUndefinedOr wrappers rely on this conformance to push an isSome flag and
// then delegate to the stack-based lowering defined below.
// swiftlint:disable:next type_name
}

extension Dictionary: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftDictionaryStackType
where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
public typealias DictionaryValue = Value

@_spi(BridgeJS) public static func bridgeJSStackPop() -> [String: Value] {
let count = Int(_swift_js_pop_i32())
Expand All @@ -1960,7 +1944,10 @@ where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Val
}
_swift_js_push_i32(count)
}
}

extension Dictionary: _BridgedSwiftTypeLoweredIntoVoidType
where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
@_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Value] {
bridgeJSStackPop()
}
Expand All @@ -1975,10 +1962,9 @@ where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Val
}
}

extension _BridgedAsOptional where Wrapped: _BridgedSwiftDictionaryStackType {
typealias DictionaryValue = Wrapped.DictionaryValue

@_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 {
extension _BridgedAsOptional {
@_spi(BridgeJS) public consuming func bridgeJSLowerParameter<Value>() -> Int32
where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
switch asOptional {
case .none:
return 0
Expand All @@ -1988,22 +1974,25 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftDictionaryStackType {
}
}

@_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Self {
@_spi(BridgeJS) public static func bridgeJSLiftParameter<Value>(_ isSome: Int32) -> Self
where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
if isSome == 0 {
return Self(optional: nil)
}
return Self(optional: (Dictionary<String, Wrapped.DictionaryValue>.bridgeJSStackPop() as! Wrapped))
return Self(optional: Dictionary<String, Value>.bridgeJSStackPop())
}

@_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Self {
@_spi(BridgeJS) public static func bridgeJSLiftReturn<Value>() -> Self
where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
let isSome = _swift_js_pop_i32()
if isSome == 0 {
return Self(optional: nil)
}
return Self(optional: (Dictionary<String, Wrapped.DictionaryValue>.bridgeJSStackPop() as! Wrapped))
return Self(optional: Dictionary<String, Value>.bridgeJSStackPop())
}

@_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void {
@_spi(BridgeJS) public consuming func bridgeJSLowerReturn<Value>() -> Void
where Wrapped == Dictionary<String, Value>, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {
Wrapped.bridgeJSStackPushAsOptional(asOptional)
}
}