Skip to content

Fix Swift 6.0 support #165

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
merged 2 commits into from
Sep 8, 2025
Merged

Fix Swift 6.0 support #165

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
e839d86
Fix Swift 6.0 support
stephencelis Sep 8, 2025
f194ce2
wip
stephencelis Sep 8, 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
7 changes: 7 additions & 0 deletions Sources/StructuredQueriesMacros/Internal/Nonisolated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import SwiftSyntax

#if compiler(>=6.1)
let nonisolated: TokenSyntax? = .keyword(.nonisolated, trailingTrivia: .space)
#else
let nonisolated: TokenSyntax? = nil
#endif
14 changes: 7 additions & 7 deletions Sources/StructuredQueriesMacros/TableMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ extension TableMacro: ExtensionMacro {
if let draftTableType {
initFromOther = """

public nonisolated init(_ other: \(draftTableType)) {
public \(nonisolated)init(_ other: \(draftTableType)) {
\(allColumns.map { "self.\($0) = other.\($0)" as ExprSyntax }, separator: "\n")
}
"""
Expand Down Expand Up @@ -571,7 +571,7 @@ extension TableMacro: ExtensionMacro {
if let schemaName {
letSchemaName = """

public nonisolated static let schemaName: Swift.String? = \(schemaName)
public \(nonisolated)static let schemaName: Swift.String? = \(schemaName)
"""
}
var initDecoder: DeclSyntax?
Expand All @@ -589,7 +589,7 @@ extension TableMacro: ExtensionMacro {
} else {
initDecoder = """

public nonisolated init(decoder: inout some \(moduleName).QueryDecoder) throws {
public \(nonisolated)init(decoder: inout some \(moduleName).QueryDecoder) throws {
\(raw: (decodings + decodingUnwrappings + decodingAssignments).joined(separator: "\n"))
}
"""
Expand All @@ -598,11 +598,11 @@ extension TableMacro: ExtensionMacro {
return [
DeclSyntax(
"""
\(declaration.attributes.availability)nonisolated extension \(type)\
\(declaration.attributes.availability)\(nonisolated)extension \(type)\
\(conformances.isEmpty ? "" : ": \(conformances, separator: ", ")") {\
\(statics, separator: "\n")
public nonisolated static var columns: TableColumns { TableColumns() }
public nonisolated static var tableName: String { \(tableName) }\(letSchemaName)\(initDecoder)\(initFromOther)
public \(nonisolated)static var columns: TableColumns { TableColumns() }
public \(nonisolated)static var tableName: String { \(tableName) }\(letSchemaName)\(initDecoder)\(initFromOther)
}
"""
)
Expand Down Expand Up @@ -1029,7 +1029,7 @@ extension TableMacro: MemberMacro {

return [
"""
public nonisolated struct TableColumns: \(schemaConformances, separator: ", ") {
public \(nonisolated)struct TableColumns: \(schemaConformances, separator: ", ") {
public typealias QueryValue = \(type.trimmed)
\(columnsProperties, separator: "\n")
public static var allColumns: [any \(moduleName).TableColumnExpression] { \
Expand Down
172 changes: 87 additions & 85 deletions Tests/StructuredQueriesTests/SelectTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,92 +1247,94 @@ extension SnapshotTests {
}
}

@Test func reusableStaticHelperOnDraft() {
assertQuery(
Reminder.Draft.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.where { _ in true }.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE 1 AND NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.select(\.id).incomplete
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.all.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
#if swift(>=6.1)
@Test func reusableStaticHelperOnDraft() {
assertQuery(
Reminder.Draft.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.where { _ in true }.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE 1 AND NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.select(\.id).incomplete
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
assertQuery(
Reminder.Draft.all.incomplete.select(\.id)
) {
"""
SELECT "reminders"."id"
FROM "reminders"
WHERE NOT ("reminders"."isCompleted")
"""
} results: {
"""
┌───┐
│ 1 │
│ 2 │
│ 3 │
│ 5 │
│ 6 │
│ 8 │
│ 9 │
└───┘
"""
}
}
}
#endif

@Test func reusableColumnHelperOnDraft() {
assertQuery(
Expand Down