Skip to content

Unroll reduces to statements in macro expansion. #196

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
stephencelis merged 2 commits into from
Oct 3, 2025
Merged

Unroll reduces to statements in macro expansion. #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33cf73
Unroll reduces to statements in macro expansion.
mbrandonw Oct 3, 2025
3192f7a
wip
stephencelis Oct 3, 2025
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
20 changes: 1 addition & 19 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Sources/StructuredQueriesMacros/TableMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,11 @@ extension TableMacro: ExtensionMacro {
public typealias From = Swift.Never
""",
])
let columnWidth: ExprSyntax = "[\(columnWidths, separator: ", ")].reduce(0, +)"
let columnWidth: ExprSyntax = """
var columnWidth = 0
columnWidth += \(columnWidths, separator: "\ncolumnWidth += ")
return columnWidth
"""

return [
DeclSyntax(
Expand Down
17 changes: 13 additions & 4 deletions Sources/StructuredQueriesSQLiteMacros/DatabaseFunctionMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extension DatabaseFunctionMacro: PeerMacro {

let functionTypeName = context.makeUniqueName(declarationName)
let databaseFunctionName = StringLiteralExprSyntax(content: functionName)
var argumentCount: [ExprSyntax] = []
var argumentCounts: [ExprSyntax] = []

var bodyArguments: [String] = []
var representableInputTypes: [String] = []
Expand Down Expand Up @@ -144,7 +144,7 @@ extension DatabaseFunctionMacro: PeerMacro {
parameters.append(parameterName)
argumentBindings.append(parameterName)

argumentCount.append("\(type)")
argumentCounts.append("\(type)")
decodings.append("let \(parameterName) = try decoder.decode(\(type).self)")
decodingUnwrappings.append("guard let \(parameterName) else { throw InvalidInvocation() }")
}
Expand Down Expand Up @@ -215,6 +215,15 @@ extension DatabaseFunctionMacro: PeerMacro {
? representableInputType
: "(\(representableInputType))"

let argumentCount =
argumentCounts.isEmpty
? "0"
: """
var argumentCount = 0
\(argumentCounts.map { "argumentCount += \($0)._columnWidth\n" }.joined())\
return argumentCount
"""

return [
"""
\(attributes)\(access)\(`static`)var $\(raw: declarationName): \(functionTypeName) {
Expand All @@ -227,8 +236,8 @@ extension DatabaseFunctionMacro: PeerMacro {
public typealias Input = \(raw: representableInputType)
public typealias Output = \(representableOutputType)
public let name = \(databaseFunctionName)
public var argumentCount: Int? { \
[\(raw: argumentCount.map { "\($0)._columnWidth" }.joined(separator: ", "))].reduce(0, +) \
public var argumentCount: Int? {
\(raw: argumentCount)
}
public let isDeterministic = \(raw: isDeterministic)
public let body: \(raw: bodyType)
Expand Down
66 changes: 45 additions & 21 deletions Tests/StructuredQueriesMacrosTests/DatabaseFunctionMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Date
Expand Down Expand Up @@ -80,7 +80,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "current_date"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Date
Expand Down Expand Up @@ -132,7 +132,9 @@ extension SnapshotTests {
public typealias Output = [String].JSONRepresentation
public let name = "jsonCapitalize"
public var argumentCount: Int? {
[[String].JSONRepresentation._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += [String].JSONRepresentation._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: ([String]) -> [String]
Expand Down Expand Up @@ -188,7 +190,7 @@ extension SnapshotTests {
public typealias Output = Int
public let name = "fortyTwo"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = true
public let body: () -> Int
Expand Down Expand Up @@ -240,7 +242,9 @@ extension SnapshotTests {
public typealias Output = Date?
public let name = "currentDate"
public var argumentCount: Int? {
[String._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String) -> Date?
Expand Down Expand Up @@ -296,7 +300,9 @@ extension SnapshotTests {
public typealias Output = Date?
public let name = "currentDate"
public var argumentCount: Int? {
[String._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String) -> Date?
Expand Down Expand Up @@ -352,7 +358,9 @@ extension SnapshotTests {
public typealias Output = Date?
public let name = "currentDate"
public var argumentCount: Int? {
[String._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String) -> Date?
Expand Down Expand Up @@ -408,7 +416,9 @@ extension SnapshotTests {
public typealias Output = Date?
public let name = "currentDate"
public var argumentCount: Int? {
[String._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String) -> Date?
Expand Down Expand Up @@ -464,7 +474,10 @@ extension SnapshotTests {
public typealias Output = String
public let name = "concat"
public var argumentCount: Int? {
[String._columnWidth, String._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String._columnWidth
argumentCount += String._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String, String) -> String
Expand Down Expand Up @@ -541,7 +554,9 @@ extension SnapshotTests {
public typealias Output = Date?
public let name = "currentDate"
public var argumentCount: Int? {
[String?._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += String?._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (String?) -> Date?
Expand Down Expand Up @@ -597,7 +612,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () throws -> Date
Expand Down Expand Up @@ -653,7 +668,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () throws(MyError) -> Date
Expand Down Expand Up @@ -709,7 +724,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Date
Expand Down Expand Up @@ -761,7 +776,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Date
Expand Down Expand Up @@ -836,7 +851,7 @@ extension SnapshotTests {
public typealias Output = Date
public let name = "currentDate"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Date
Expand Down Expand Up @@ -888,7 +903,7 @@ extension SnapshotTests {
public typealias Output = Int
public let name = "default"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Int
Expand Down Expand Up @@ -940,7 +955,7 @@ extension SnapshotTests {
public typealias Output = Swift.Void
public let name = "void"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () -> Swift.Void
Expand Down Expand Up @@ -987,7 +1002,7 @@ extension SnapshotTests {
public typealias Output = Swift.Void
public let name = "void"
public var argumentCount: Int? {
[].reduce(0, +)
0
}
public let isDeterministic = false
public let body: () throws -> Swift.Void
Expand Down Expand Up @@ -1047,7 +1062,10 @@ extension SnapshotTests {
public typealias Output = Swift.Void
public let name = "min"
public var argumentCount: Int? {
[Int._columnWidth, Int._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += Int._columnWidth
argumentCount += Int._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (Int, Int) -> Swift.Void
Expand Down Expand Up @@ -1111,7 +1129,10 @@ extension SnapshotTests {
public typealias Output = Swift.Void
public let name = "min"
public var argumentCount: Int? {
[Int._columnWidth, Int._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += Int._columnWidth
argumentCount += Int._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (Int, Int) -> Swift.Void
Expand Down Expand Up @@ -1172,7 +1193,10 @@ extension SnapshotTests {
public typealias Output = Bool
public let name = "isValid"
public var argumentCount: Int? {
[Reminder._columnWidth, Bool._columnWidth].reduce(0, +)
var argumentCount = 0
argumentCount += Reminder._columnWidth
argumentCount += Bool._columnWidth
return argumentCount
}
public let isDeterministic = false
public let body: (Reminder, Bool) -> Bool
Expand Down
Loading