fix json/b nested fields casing (#421)

Author: Newbie012

.changeset/proud-webs-see.md

@@ -0,0 +1,6 @@
+---
+"@ts-safeql/eslint-plugin": patch
+"@ts-safeql/generate": patch
+---
+
+fixed an issue where json/b fields weren't transformed when using `fieldTransform`

packages/eslint-plugin/src/rules/check-sql.test.ts

@@ -1878,6 +1878,33 @@ RuleTester.describe("check-sql", () => {
           \`;
         `,
       },
+      {
+        name: "json/b: fieldTransform camel should apply to jsonb_build_object keys",
+        options: withConnection(connections.withTag, {
+          targets: [{ tag: "sql", fieldTransform: "camel" }],
+        }),
+        code: `sql<{ candidateLocations: { isSelected: boolean }[] | null }>\`
+          SELECT
+            jsonb_agg(
+              jsonb_build_object(
+                'is_selected', TRUE
+              )
+            ) AS candidate_locations
+        \``,
+      },
+      {
+        name: "json/b: fieldTransform camel should apply to nested jsonb_build_object keys",
+        options: withConnection(connections.withTag, {
+          targets: [{ tag: "sql", fieldTransform: "camel" }],
+        }),
+        code: `sql<{ metadata: { outerKey: { innerKey: 'value' } } }>\`
+          SELECT
+            jsonb_build_object(
+              'outer_key',
+              jsonb_build_object('inner_key', 'value')
+            ) AS metadata
+        \``,
+      },
     ],
     invalid: [
       {
@@ -1997,6 +2024,29 @@ RuleTester.describe("check-sql", () => {
         `,
         errors: [{ messageId: "missingTypeAnnotations" }],
       },
+      {
+        name: "json/b: fieldTransform camel should enforce transformation on jsonb keys",
+        options: withConnection(connections.withTag, {
+          targets: [{ tag: "sql", fieldTransform: "camel" }],
+        }),
+        code: `sql<{ candidateLocations: { is_selected: boolean }[] | null }>\`
+          SELECT
+            jsonb_agg(
+              jsonb_build_object(
+                'is_selected', TRUE
+              )
+            ) AS candidate_locations
+        \``,
+        output: `sql<{ candidateLocations: { isSelected: boolean }[] | null }>\`
+          SELECT
+            jsonb_agg(
+              jsonb_build_object(
+                'is_selected', TRUE
+              )
+            ) AS candidate_locations
+        \``,
+        errors: [{ messageId: "incorrectTypeAnnotations" }],
+      },
     ],
   });
 

packages/generate/src/ast-describe.ts

@@ -1,4 +1,4 @@
-import { fmap, normalizeIndent } from "@ts-safeql/shared";
+import { fmap, normalizeIndent, toCase, IdentiferCase } from "@ts-safeql/shared";
 import * as LibPgQueryAST from "@ts-safeql/sql-ast";
 import {
   isColumnStarRef,
@@ -26,6 +26,7 @@ type ASTDescriptionOptions = {
   pgTypes: PgTypesMap;
   pgEnums: PgEnumsMaps;
   pgFns: Map<string, { ts: string; pg: string }>;
+  fieldTransform: IdentiferCase | undefined;
 };
 
 type ASTDescriptionContext = ASTDescriptionOptions & {
@@ -571,6 +572,7 @@ function getDescribedSelectStmt({
     pgTypes: context.pgTypes,
     pgEnums: context.pgEnums,
     pgFns: context.pgFns,
+    fieldTransform: context.fieldTransform,
   });
 
   const firstColumn = subDescription.map.get(0);
@@ -936,7 +938,8 @@ function getDescribedJsonBuildObjectFunCall({
       return [unknownDescribedColumn];
     }
 
-    describedColumn.value.push([alias, resolveType({ context, nullable: false, type })]);
+    const transformedKey = toCase(alias, context.fieldTransform);
+    describedColumn.value.push([transformedKey, resolveType({ context, nullable: false, type })]);
   }
 
   return [

packages/generate/src/generate.ts

@@ -271,6 +271,7 @@ async function generate(
       pgEnums: pgEnums,
       pgFns: functionsMap,
       typeExprMap: pgTypeExprMap,
+      fieldTransform: params.fieldTransform,
     });
 
     const columns = result.columns.map((col, position): ColumnAnalysisResult => {