claude expanding logic to all selection and adding tests

Author: MillanWangGadget

packages/api-client-core/spec/operationBuilders.spec.ts

@@ -1621,4 +1621,120 @@ describe("operation builders", () => {
       `);
     });
   });
+
+  describe("selection auto-expansion", () => {
+    const defaultSelectionWithSpecialFields = {
+      __typename: true,
+      id: true,
+      name: true,
+      richText: { markdown: true, truncatedHTML: true },
+      fileField: { url: true, mimeType: true, fileName: true },
+      roleField: { key: true, name: true },
+    };
+
+    describe("findOneOperation", () => {
+      test("auto-expands richText: true to sub-selection from defaultSelection", () => {
+        const result = findOneOperation(
+          "widget",
+          "123",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          { select: { id: true, richText: true } }
+        );
+        expect(result.query).toContain("richText");
+        expect(result.query).toContain("markdown");
+        expect(result.query).toContain("truncatedHTML");
+      });
+
+      test("auto-expands fileField: true to sub-selection from defaultSelection", () => {
+        const result = findOneOperation(
+          "widget",
+          "123",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          { select: { id: true, fileField: true } }
+        );
+        expect(result.query).toContain("fileField");
+        expect(result.query).toContain("url");
+        expect(result.query).toContain("mimeType");
+        expect(result.query).toContain("fileName");
+      });
+
+      test("auto-expands roleField: true to sub-selection from defaultSelection", () => {
+        const result = findOneOperation(
+          "widget",
+          "123",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          { select: { id: true, roleField: true } }
+        );
+        expect(result.query).toContain("roleField");
+        expect(result.query).toContain("key");
+        expect(result.query).toContain("name");
+      });
+
+      test("preserves explicit object selections without overwriting", () => {
+        const result = findOneOperation(
+          "widget",
+          "123",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          { select: { id: true, richText: { markdown: true } } }
+        );
+        expect(result.query).toContain("markdown");
+        expect(result.query).not.toContain("truncatedHTML");
+      });
+
+      test("leaves normal scalar fields untouched", () => {
+        const result = findOneOperation(
+          "widget",
+          "123",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          { select: { id: true, name: true } }
+        );
+        expect(result.query).toContain("id");
+        expect(result.query).toContain("name");
+        expect(result.query).not.toContain("richText");
+      });
+    });
+
+    describe("findManyOperation", () => {
+      test("auto-expands richText: true in findMany", () => {
+        const result = findManyOperation("widgets", defaultSelectionWithSpecialFields, "widget", {
+          select: { id: true, richText: true },
+        });
+        expect(result.query).toContain("richText");
+        expect(result.query).toContain("markdown");
+        expect(result.query).toContain("truncatedHTML");
+      });
+
+      test("auto-expands fileField: true in findMany", () => {
+        const result = findManyOperation("widgets", defaultSelectionWithSpecialFields, "widget", {
+          select: { id: true, fileField: true },
+        });
+        expect(result.query).toContain("fileField");
+        expect(result.query).toContain("url");
+        expect(result.query).toContain("mimeType");
+      });
+    });
+
+    describe("actionOperation", () => {
+      test("auto-expands richText: true in action", () => {
+        const result = actionOperation(
+          "createWidget",
+          defaultSelectionWithSpecialFields,
+          "widget",
+          "widget",
+          {
+            widget: { type: "CreateWidgetInput", value: { name: "test" } },
+          },
+          { select: { id: true, richText: true } }
+        );
+        expect(result.query).toContain("richText");
+        expect(result.query).toContain("markdown");
+        expect(result.query).toContain("truncatedHTML");
+      });
+    });
+  });
 });

packages/api-client-core/src/operationBuilders.ts

@@ -24,6 +24,30 @@ const fieldSelectionToQueryCompilerFields = (selection: FieldSelection, includeT
 
 export type FindFirstPaginationOptions = Omit<FindManyOptions, "first" | "last" | "before" | "after">;
 
+/**
+ * When a user passes `{ field: true }` for a field that requires sub-selections
+ * (like richText, file, or role fields), auto-expand it using the defaultSelection.
+ */
+const normalizeSelection = (selection: FieldSelection, defaultSelection: FieldSelection): FieldSelection => {
+  const result: FieldSelection = {};
+  for (const [key, value] of Object.entries(selection)) {
+    const defaultValue = defaultSelection[key];
+    if (value === true && defaultValue && typeof defaultValue === "object") {
+      result[key] = defaultValue;
+    } else if (value && typeof value === "object" && defaultValue && typeof defaultValue === "object") {
+      result[key] = normalizeSelection(value as FieldSelection, defaultValue as FieldSelection);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+};
+
+const resolveSelection = (defaultSelection: FieldSelection, userSelection?: FieldSelection | null): FieldSelection => {
+  if (!userSelection) return defaultSelection;
+  return normalizeSelection(userSelection, defaultSelection);
+};
+
 const directivesForOptions = (options?: BaseFindOptions | null) => {
   if (options?.live) return ["@live"];
   return undefined;
@@ -41,7 +65,7 @@ export const findOneOperation = (
   if (typeof id !== "undefined") variables.id = Var({ type: "GadgetID!", value: id });
 
   let fields = {
-    [operation]: Call(variables, fieldSelectionToQueryCompilerFields(options?.select || defaultSelection, true)),
+    [operation]: Call(variables, fieldSelectionToQueryCompilerFields(resolveSelection(defaultSelection, options?.select), true)),
   };
 
   fields = namespacify(namespace, fields);
@@ -105,7 +129,7 @@ export const findManyOperation = (
         pageInfo: { hasNextPage: true, hasPreviousPage: true, startCursor: true, endCursor: true },
         edges: {
           cursor: true,
-          node: fieldSelectionToQueryCompilerFields(options?.select || defaultSelection, true),
+          node: fieldSelectionToQueryCompilerFields(resolveSelection(defaultSelection, options?.select), true),
         },
       }
     ),
@@ -176,7 +200,7 @@ export const actionOperation = (
   isBulkAction?: boolean | null,
   hasReturnType?: HasReturnType | null
 ) => {
-  const selection = options?.select || defaultSelection;
+  const selection = resolveSelection(defaultSelection!, options?.select);
 
   let fields: BuilderFieldSelection = {
     [operation]: Call(
@@ -223,7 +247,7 @@ export const backgroundActionResultOperation = <Action extends AnyActionFunction
 
   switch (backgroundAction.type) {
     case "action": {
-      const selection = options?.select || backgroundAction.defaultSelection;
+      const selection = resolveSelection(backgroundAction.defaultSelection, options?.select);
 
       fields = {
         [`... on ${resultType}`]: actionResultFieldSelection(