Skip to content

Following up on closures property wrappers cleanup #60

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.

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
merged 1 commit into from
Apr 24, 2025
Merged
Changes from all commits
Commits
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
48 changes: 14 additions & 34 deletions Sources/WebIDLToSwift/WebIDL+SwiftRepresentation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,27 @@ extension IDLAttribute: SwiftRepresentable {
}
if ModuleState.override {
assert(!ModuleState.static)
// can't do property wrappers on override declarations
return """
@usableFromInline let \(wrapperName): \(idlType.propertyWrapper(readonly: readonly))<\(idlType)>
@inlinable override public var \(name): \(idlType) {
get { \(wrapperName).wrappedValue }
\(readonly ? "" : "set { \(wrapperName).wrappedValue = newValue }")
}
"""
} else if ModuleState.constructor == nil || ModuleState.static {
// can't do property wrappers on extensions
let propertyWrapper = idlType.propertyWrapper(readonly: readonly)
if [SwiftSource.readOnlyAttribute, .readWriteAttribute].contains(propertyWrapper) {
let setter: SwiftSource = """
nonmutating set { jsObject[\(ModuleState.source(for: name))] = _toJSValue(newValue) }
"""

return """
@inlinable public\(raw: ModuleState.static ? " static" : "") var \(name): \(idlType) {
get { jsObject[\(ModuleState.source(for: name))]\(idlType.fromJSValue) }
\(readonly ? "" : setter)
}
"""
return ""
} else {
let stringKey = ModuleState.source(for: name)
let getter: SwiftSource
let setter: SwiftSource

if let closure = idlType.closurePattern {
getter = "get { \(closure.getter(name: stringKey)) }"
setter = "set { \(closure.setter(name: stringKey)) }"
} else {
let setter: SwiftSource = """
nonmutating set { \(
idlType.propertyWrapper(readonly: readonly))[\(ModuleState.source(for: name)
), in: jsObject] = newValue }
"""
getter = "get { jsObject[\(stringKey)]\(idlType.fromJSValue) }"
setter = "set { jsObject[\(stringKey)] = _toJSValue(newValue) }"
}

return """
return """
@inlinable public\(raw: ModuleState.static ? " static" : "") var \(name): \(idlType) {
get { \(idlType.propertyWrapper(readonly: readonly))[\(ModuleState.source(for: name)), in: jsObject] }
\(getter)
\(readonly ? "" : setter)
}
"""
}
} else {
return """
@\(idlType.propertyWrapper(readonly: readonly))
public var \(name): \(idlType)
"""
}
}

Expand Down
Loading