Make a method

Author: stephencelis

Sources/StructuredQueriesCore/Documentation.docc/Extensions/QueryExpression.md

@@ -28,6 +28,7 @@
 
 - ``jsonArrayLength()``
 - ``jsonGroupArray(order:filter:)``
+- ``jsonObject()``
 - ``jsonPatch(_:)``
 
 ### Optionality

Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift

@@ -115,7 +115,7 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
     AggregateFunction(
       "json_group_array",
       isDistinct: isDistinct,
-      [jsonObject.queryFragment],
+      [jsonObject().queryFragment],
       order: order?.queryFragment,
       filter: filter?.queryFragment
     )
@@ -188,15 +188,18 @@ extension PrimaryKeyedTableDefinition where QueryValue: _OptionalProtocol & Coda
     return AggregateFunction(
       "json_group_array",
       isDistinct: isDistinct,
-      [QueryValue.columns.jsonObject.queryFragment],
+      [QueryValue.columns.jsonObject().queryFragment],
       order: order?.queryFragment,
       filter: filterQueryFragment
     )
   }
 }
 
 extension TableDefinition where QueryValue: Codable & Sendable {
-  public var jsonObject: some QueryExpression<_CodableJSONRepresentation<QueryValue>> {
+  /// A JSON representation of a table's columns.
+  ///
+  /// Useful for referencing a table row in a larger JSON selection.
+  public func jsonObject() -> some QueryExpression<_CodableJSONRepresentation<QueryValue>> {
     func open<TableColumn: TableColumnExpression>(_ column: TableColumn) -> QueryFragment {
       typealias Value = TableColumn.QueryValue._Optionalized.Wrapped
 
@@ -244,7 +247,10 @@ extension TableDefinition where QueryValue: Codable & Sendable {
 }
 
 extension Optional.TableColumns where QueryValue: Codable & Sendable {
-  public var jsonObject: some QueryExpression<_CodableJSONRepresentation<Wrapped>?> {
-    Case().when(rowid.isNot(nil), then: Wrapped.columns.jsonObject)
+  /// A JSON representation of a table's columns.
+  ///
+  /// Useful for referencing a table row in a larger JSON selection.
+  public func jsonObject() -> some QueryExpression<_CodableJSONRepresentation<Wrapped>?> {
+    Case().when(rowid.isNot(nil), then: Wrapped.columns.jsonObject())
   }
 }

Tests/StructuredQueriesTests/JSONFunctionsTests.swift

@@ -344,7 +344,7 @@ extension SnapshotTests {
       assertQuery(
         Reminder
           .join(RemindersList.all) { $0.remindersListID.eq($1.id) }
-          .select { ($0, $1.jsonObject) }
+          .select { ($0, $1.jsonObject()) }
       ) {
         """
         SELECT "reminders"."id", "reminders"."assignedUserID", "reminders"."dueDate", "reminders"."isCompleted", "reminders"."isFlagged", "reminders"."notes", "reminders"."priority", "reminders"."remindersListID", "reminders"."title", "reminders"."updatedAt", json_object('id', json_quote("remindersLists"."id"), 'color', json_quote("remindersLists"."color"), 'title', json_quote("remindersLists"."title"), 'position', json_quote("remindersLists"."position"))