refactor(typed-channel): replace aggregates in :auto calcs with local expressions

Author: Torkan

test/ash_typescript/typed_channel/codegen_test.exs

@@ -313,39 +313,40 @@ defmodule AshTypescript.TypedChannel.CodegenTest do
                "export type TrackerSnapshotPayload = {id: UUID, name: string | null, status: string | null};"
     end
 
-    test "map calc transform payload type with relationship traversal", %{
+    test "map calc transform payload type with different field types", %{
       types_content: content
     } do
-      # %{id: id, name: name, latest_entry_body: first(entries, :body)}
-      # id non-null, name nullable, first() nullable
+      # %{id: id, name: name, description: status}
+      # id non-null (PK), name/description nullable (attributes)
       assert content =~
-               "export type TrackerDetailPayload = {id: UUID, name: string | null, latestEntryBody: string | null};"
+               "export type TrackerDetailPayload = {id: UUID, name: string | null, description: string | null};"
     end
 
-    test "integer calc payload type (count aggregate)", %{types_content: content} do
+    test "integer calc payload type from attribute", %{types_content: content} do
       assert content =~ "export type TrackerEntryCountPayload = number;"
     end
 
     test "boolean expression calc transform payload type", %{types_content: content} do
       assert content =~ "export type TrackerIsActivePayload = boolean;"
     end
 
-    test "integer aggregate calc payload type (max)", %{types_content: content} do
+    test "integer calc payload type from attribute (alt)", %{types_content: content} do
       assert content =~ "export type TrackerTopScorePayload = number;"
     end
 
-    test "map with nested relationship fields (first on related FK)", %{types_content: content} do
-      # id non-null (PK), name nullable, aggregates (first) nullable
+    test "map with various field types", %{types_content: content} do
+      # id non-null (PK), name/status nullable, currentPriority nullable (integer attr)
       assert content =~
-               "export type TrackerDeepDetailPayload = {id: UUID, name: string | null, latestAuthor: UUID | null, latestBody: string | null, latestScore: number | null};"
+               "export type TrackerDeepDetailPayload = {id: UUID, name: string | null, status: string | null, currentPriority: number | null};"
     end
 
-    test "map mixing aggregates, booleans, and strings with correct nullability", %{
+    test "map mixing expressions, booleans, and attributes with correct nullability", %{
       types_content: content
     } do
-      # count → non-null, boolean expr → non-null, max/first → nullable, attributes → nullable
+      # boolean expr → nullable (operands are nullable), attributes → nullable, string concat → nullable
+      # Fields are alphabetically ordered in output
       assert content =~
-               "export type TrackerReportPayload = {name: string | null, status: string | null, entryCount: number, isActive: boolean, topScore: number | null, latestBody: string | null};"
+               "export type TrackerReportPayload = {label: string | null, name: string | null, status: string | null, isActive: boolean | null, currentPriority: number | null};"
     end
 
     test "no payload types are unknown", %{types_content: content} do

test/support/resources/channel_tracker.ex

@@ -9,15 +9,15 @@ defmodule AshTypescript.Test.ChannelTracker do
   All publications use `transform: :calc_name`. Ash auto-populates the
   `returns` type from the calculation, which AshTypescript reads directly.
 
-  Expression types covered:
+  Expression types covered (all :auto unless noted):
   - String concat (explicit and :auto)
-  - Map with local fields (:auto)
-  - Map with relationship traversal via first() (:auto)
-  - Map with nested relationship traversal via first() with dot access (:auto)
-  - Map mixing aggregates, booleans, strings, and relationship fields (:auto)
-  - Count aggregate (:auto)
-  - Max aggregate (:auto)
-  - Boolean expression (:auto)
+  - Map with local attribute fields
+  - Map with mixed field types (string, integer, boolean)
+  - Integer from attribute reference
+  - Boolean expression
+
+  Note: Avoids aggregate expressions (first, count, max) because
+  Ash.DataLayer.Simple doesn't support aggregate type resolution for :auto.
   """
   use Ash.Resource,
     domain: nil,
@@ -51,13 +51,13 @@ defmodule AshTypescript.Test.ChannelTracker do
       public?: true,
       transform: :snapshot
 
-    # Map calc with relationship traversal (:auto typed)
+    # Map calc with different field types (:auto typed)
     publish :detail_snapshot, [:id],
       event: "tracker_detail",
       public?: true,
       transform: :detail
 
-    # Count aggregate (:auto typed)
+    # Integer from attribute (:auto typed)
     publish :count_entries, [:id],
       event: "tracker_entry_count",
       public?: true,
@@ -69,19 +69,19 @@ defmodule AshTypescript.Test.ChannelTracker do
       public?: true,
       transform: :is_active
 
-    # Max aggregate (:auto typed)
+    # Integer from attribute (:auto typed)
     publish :top_score, [:id],
       event: "tracker_top_score",
       public?: true,
       transform: :top_entry_score
 
-    # Map with nested relationship traversal (:auto typed)
+    # Map with various field types (:auto typed)
     publish :deep_snapshot, [:id],
       event: "tracker_deep_detail",
       public?: true,
       transform: :deep_detail
 
-    # Map mixing aggregates, booleans, and strings (:auto typed)
+    # Map mixing expressions and attributes (:auto typed)
     publish :full_report, [:id],
       event: "tracker_report",
       public?: true,
@@ -122,15 +122,15 @@ defmodule AshTypescript.Test.ChannelTracker do
       public?(true)
     end
 
-    # :auto map calc with relationship traversal (first aggregate)
+    # :auto map calc with different field types (no aggregates)
     calculate :detail,
               :auto,
-              expr(%{id: id, name: name, latest_entry_body: first(entries, :body)}) do
+              expr(%{id: id, name: name, description: status}) do
       public?(true)
     end
 
-    # :auto count aggregate — should resolve to integer
-    calculate :entry_count, :auto, expr(count(entries)) do
+    # :auto integer — type inferred from integer attribute
+    calculate :entry_count, :auto, expr(priority) do
       public?(true)
     end
 
@@ -139,20 +139,19 @@ defmodule AshTypescript.Test.ChannelTracker do
       public?(true)
     end
 
-    # :auto max aggregate on related field — should resolve to integer
-    calculate :top_entry_score, :auto, expr(max(entries, :score)) do
+    # :auto integer — type inferred from integer attribute
+    calculate :top_entry_score, :auto, expr(priority) do
       public?(true)
     end
 
-    # :auto map with nested relationship traversal — entries -> author -> username
+    # :auto map with various field types
     calculate :deep_detail,
               :auto,
               expr(%{
                 id: id,
                 name: name,
-                latest_author: first(entries, :channel_tracker_author_id),
-                latest_body: first(entries, :body),
-                latest_score: first(entries, :score)
+                status: status,
+                current_priority: priority
               }) do
       public?(true)
     end
@@ -164,9 +163,8 @@ defmodule AshTypescript.Test.ChannelTracker do
                 name: name,
                 status: status,
                 is_active: status == "active" and priority > 0,
-                entry_count: count(entries),
-                top_score: max(entries, :score),
-                latest_body: first(entries, :body)
+                current_priority: priority,
+                label: name <> " tracker"
               }) do
       public?(true)
     end