@salesforce/templates 66.3.0 → 66.3.2

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/{pages → features/authentication/pages}/Profile.tsx

@@ -1,14 +1,14 @@
 import { useState, useEffect } from "react";
 import { z } from "zod";
 
-import { executeGraphQL } from "@salesforce/webapp-experimental/api";
+import { getDataSDK } from "@salesforce/sdk-data";
 
-import { CenteredPageLayout } from "../components/layout/centered-page-layout";
-import { CardSkeleton } from "../components/layout/card-skeleton";
-import { AuthForm } from "../components/forms/auth-form";
+import { CenteredPageLayout } from "../layout/centered-page-layout";
+import { CardSkeleton } from "../layout/card-skeleton";
+import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { ROUTES } from "../components/auth/authenticationConfig";
-import { emailSchema } from "../components/auth/authHelpers";
+import { ROUTES } from "../authenticationConfig";
+import { emailSchema } from "../authHelpers";
 import { flattenGraphQLRecord, getErrorMessage } from "../utils/helpers";
 import { getUser } from "../context/AuthContext";
 
@@ -81,10 +81,14 @@ export default function Profile() {
 			setSubmitError(null);
 			setSuccess(false);
 			try {
-				const result: any = await executeGraphQL(MUTATE_PROFILE_GRAPHQL, {
+				const data = await getDataSDK();
+				const response: any = await data.graphql?.(MUTATE_PROFILE_GRAPHQL, {
 					input: { Id: user.id, User: { ...value } },
 				});
-				setProfile(flattenGraphQLRecord(result?.uiapi?.UserUpdate?.Record));
+				if (response?.errors?.length) {
+					throw new Error(response.errors.map((e: any) => e.message).join("; "));
+				}
+				setProfile(flattenGraphQLRecord(response?.data?.uiapi?.UserUpdate?.Record));
 
 				setSuccess(true);
 				// Scroll to top of page after successful update so user sees it
@@ -99,11 +103,16 @@ export default function Profile() {
 	useEffect(() => {
 		let mounted = true;
 
-		executeGraphQL(QUERY_PROFILE_GRAPHQL, { userId: user.id })
-			.then(
-				(result: any) =>
-					mounted && setProfile(flattenGraphQLRecord(result?.uiapi?.query?.User?.edges?.[0]?.node)),
-			)
+		getDataSDK()
+			.then((data) => data.graphql?.(QUERY_PROFILE_GRAPHQL, { userId: user.id }))
+			.then((response: any) => {
+				if (response?.errors?.length) {
+					throw new Error(response.errors.map((e: any) => e.message).join("; "));
+				}
+				if (mounted) {
+					setProfile(flattenGraphQLRecord(response?.data?.uiapi?.query?.User?.edges?.[0]?.node));
+				}
+			})
 			.catch((err: any) => {
 				if (mounted) {
 					setLoadError(getErrorMessage(err, "Failed to load profile"));

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/{pages → features/authentication/pages}/Register.tsx

@@ -1,17 +1,12 @@
 import { useState } from "react";
 import { useNavigate, useSearchParams } from "react-router";
 import { z } from "zod";
-import { CenteredPageLayout } from "../components/layout/centered-page-layout";
-import { AuthForm } from "../components/forms/auth-form";
+import { CenteredPageLayout } from "../layout/centered-page-layout";
+import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "../lib/data-sdk";
-import { ROUTES, AUTH_PLACEHOLDERS } from "../components/auth/authenticationConfig";
-import {
-	emailSchema,
-	passwordSchema,
-	getStartUrl,
-	type AuthResponse,
-} from "../components/auth/authHelpers";
+import { getDataSDK } from "@salesforce/sdk-data";
+import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
+import { emailSchema, passwordSchema, getStartUrl, type AuthResponse } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
 
 const registerSchema = z
@@ -53,7 +48,7 @@ export default function Register() {
 				// (e.g., duplicate checks and user creation such as Site.createExternalUser).
 				const { confirmPassword, ...request } = formFieldValues;
 				const sdk = await getDataSDK();
-				const response = await sdk.fetch("/sfdcapi/services/apexrest/auth/register", {
+				const response = await sdk.fetch!("/sfdcapi/services/apexrest/auth/register", {
 					method: "POST",
 					body: JSON.stringify({ request }),
 					headers: {

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/{pages → features/authentication/pages}/ResetPassword.tsx

@@ -1,13 +1,13 @@
 import { useState } from "react";
 import { Link, useSearchParams } from "react-router";
-import { CardLayout } from "../components/layout/card-layout";
-import { CenteredPageLayout } from "../components/layout/centered-page-layout";
-import { AuthForm } from "../components/forms/auth-form";
-import { StatusAlert } from "../components/alerts/status-alert";
+import { CardLayout } from "../../../components/layouts/card-layout";
+import { CenteredPageLayout } from "../layout/centered-page-layout";
+import { AuthForm } from "../forms/auth-form";
+import { StatusAlert } from "../../../components/alerts/status-alert";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "../lib/data-sdk";
-import { ROUTES, AUTH_PLACEHOLDERS } from "../components/auth/authenticationConfig";
-import { newPasswordSchema } from "../components/auth/authHelpers";
+import { getDataSDK } from "@salesforce/sdk-data";
+import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
+import { newPasswordSchema } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
 
 export default function ResetPassword() {
@@ -26,7 +26,7 @@ export default function ResetPassword() {
 				// [Dev Note] Custom Apex Endpoint: /auth/reset-password
 				// You must ensure this Apex class exists in your org
 				const sdk = await getDataSDK();
-				const response = await sdk.fetch("/sfdcapi/services/apexrest/auth/reset-password", {
+				const response = await sdk.fetch!("/sfdcapi/services/apexrest/auth/reset-password", {
 					method: "POST",
 					body: JSON.stringify({ token, newPassword: value.newPassword }),
 					headers: {

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/{components/auth → features/authentication}/sessionTimeout/SessionTimeoutValidator.tsx

@@ -6,12 +6,12 @@
 import { useEffect, useState, useCallback, useRef } from "react";
 import { useLocation } from "react-router";
 import { X } from "lucide-react";
-import { useAuth } from "../../../context/AuthContext";
+import { useAuth } from "../context/AuthContext";
 import { pollSessionTimeServlet, extendSessionTime } from "./sessionTimeService";
-import { useCountdownTimer } from "../../../hooks/useCountdownTimer";
-import { useRetryWithBackoff } from "../../../hooks/useRetryWithBackoff";
-import { Alert, AlertTitle, AlertDescription } from "../../ui/alert";
-import { Button } from "../../ui/button";
+import { useCountdownTimer } from "../hooks/useCountdownTimer";
+import { useRetryWithBackoff } from "../hooks/useRetryWithBackoff";
+import { Alert, AlertTitle, AlertDescription } from "../../../components/ui/alert";
+import { Button } from "../../../components/ui/button";
 import {
 	Dialog,
 	DialogContent,
@@ -19,7 +19,7 @@ import {
 	DialogTitle,
 	DialogDescription,
 	DialogFooter,
-} from "../../ui/dialog";
+} from "../../../components/ui/dialog";
 import {
 	STORAGE_KEYS,
 	LABELS,

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/api/index.ts

@@ -0,0 +1,19 @@
+/**
+ * API layer: object metadata (GraphQL), layout + record detail (REST layout + GraphQL record), record list/single (GraphQL).
+ */
+export { objectInfoService } from "./objectInfoService";
+export { objectDetailService, extractFieldsFromLayout } from "./objectDetailService";
+export type { RecordDetailResult } from "./objectDetailService";
+export {
+	getRecordsGraphQL,
+	getRecordByIdGraphQL,
+	buildGetRecordsQuery,
+	buildWhereFromCriteria,
+	buildOrderByFromSort,
+} from "./recordListGraphQLService";
+export type {
+	RecordListGraphQLResult,
+	RecordListGraphQLVariables,
+	RecordListGraphQLOptions,
+	GraphQLRecordNode,
+} from "./recordListGraphQLService";

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/api/objectDetailService.ts

@@ -0,0 +1,125 @@
+/**
+ * Record detail service: layout (REST), object metadata (GraphQL), single record (GraphQL).
+ *
+ * getRecordDetail orchestrates layout + objectInfoBatch + getRecordByIdGraphQL for the detail page.
+ * Layout is still REST (uiApiClient); record and object info are GraphQL-backed.
+ *
+ * @module api/objectDetailService
+ */
+
+import { uiApiClient } from "@salesforce/webapp-experimental/api";
+import type { LayoutResponse } from "../types/recordDetail/recordDetail";
+import { LayoutResponseSchema } from "../types/recordDetail/recordDetail";
+import { fetchAndValidate, safeEncodePath } from "../utils/apiUtils";
+import { objectInfoService } from "./objectInfoService";
+import type { ObjectInfoResult } from "../types/objectInfo/objectInfo";
+import { getRecordByIdGraphQL, type GraphQLRecordNode } from "./recordListGraphQLService";
+import type { Column } from "../types/search/searchResults";
+import { calculateFieldsToFetch } from "../utils/recordUtils";
+
+/** Fallback when record type is unknown. Prefer recordTypeId from the record (e.g. from search or record response) when available. */
+const DEFAULT_RECORD_TYPE_ID = "012000000000000AAA";
+
+/**
+ * Returns field API names to request for a record from the given layout and object metadata.
+ * Used to derive GraphQL columns from layout (detail view). Delegates to recordUtils.calculateFieldsToFetch.
+ *
+ * @param objectMetadata - Object info (fields, relationshipName, etc.).
+ * @param layout - Layout response (sections, layoutItems, layoutComponents).
+ * @returns Array of field API names (e.g. ["Name", "OwnerId", "Owner", "CreatedDate"]).
+ */
+export function extractFieldsFromLayout(
+	objectMetadata: ObjectInfoResult,
+	layout: LayoutResponse,
+): string[] {
+	const [optionalFields] = calculateFieldsToFetch(objectMetadata, layout, false);
+	return optionalFields;
+}
+
+/**
+ * Fetches the Full/View layout for an object (REST). Used by detail view to render sections/rows/items.
+ *
+ * @param objectApiName - Object API name.
+ * @param recordTypeId - Record type Id (default master).
+ * @param signal - Optional abort signal.
+ */
+export async function getLayout(
+	objectApiName: string,
+	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
+	signal?: AbortSignal,
+): Promise<LayoutResponse> {
+	const params = new URLSearchParams({
+		layoutType: "Full",
+		mode: "View",
+		recordTypeId,
+	});
+	return fetchAndValidate(
+		(abortSignal) =>
+			uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`, {
+				signal: abortSignal,
+			}),
+		{
+			schema: LayoutResponseSchema,
+			errorContext: `layout for ${objectApiName}`,
+			signal,
+		},
+	);
+}
+
+export interface RecordDetailResult {
+	layout: LayoutResponse;
+	record: GraphQLRecordNode;
+	objectMetadata: ObjectInfoResult;
+}
+
+/**
+ * Converts layout-derived optionalFields (field API names) to Column[] for GraphQL node selection.
+ * Uses unqualified names (no entity prefix) so the GraphQL query matches UI API shape.
+ * Other Column fields (label, searchable, sortable) are only required by the type; GraphQL selection uses fieldApiName only.
+ */
+function optionalFieldsToColumns(optionalFields: string[]): Column[] {
+	return optionalFields.map((fieldApiName) => ({
+		fieldApiName,
+		label: "",
+		searchable: false,
+		sortable: false,
+	}));
+}
+
+/**
+ * Fetches everything needed for the detail page: layout (REST), object metadata (GraphQL), single record (GraphQL).
+ * Layout drives which fields are requested; getRecordByIdGraphQL fetches that field set by Id.
+ *
+ * @param objectApiName - Object API name.
+ * @param recordId - Record Id.
+ * @param recordTypeId - Record type (default master).
+ * @param signal - Optional abort signal.
+ * @returns { layout, record, objectMetadata } for DetailForm / UiApiDetailForm.
+ */
+export async function getRecordDetail(
+	objectApiName: string,
+	recordId: string,
+	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
+	signal?: AbortSignal,
+): Promise<RecordDetailResult> {
+	const layout = await getLayout(objectApiName, recordTypeId, signal);
+	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName, signal);
+	const firstResult = objectMetadata?.results?.[0]?.result;
+	if (!firstResult) {
+		throw new Error(`Object metadata not found for ${objectApiName}`);
+	}
+	// Layout-driven optionalFields (fields shown on the detail layout), not list columns
+	const [optionalFields] = calculateFieldsToFetch(firstResult, layout, false);
+	const columns = optionalFieldsToColumns(optionalFields);
+	const record = await getRecordByIdGraphQL(objectApiName, recordId, columns);
+	if (!record) {
+		throw new Error(`Record not found: ${recordId}`);
+	}
+	return { layout, record, objectMetadata: firstResult };
+}
+
+export const objectDetailService = {
+	extractFieldsFromLayout,
+	getLayout,
+	getRecordDetail,
+};

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/api/objectInfoGraphQLService.ts

@@ -0,0 +1,194 @@
+/**
+ * Object metadata GraphQL service (uiapi.objectInfos).
+ *
+ * Single endpoint for object describe and picklist values. Used by objectInfoService
+ * to implement getObjectInfoBatch and getPicklistValues. Not used directly by UI.
+ *
+ * @module api/objectInfoGraphQLService
+ */
+
+import { getDataSDK } from "@salesforce/sdk-data";
+
+/** GraphQL objectInfoInputs for requesting picklist values (API v65.0+). Only apiName and fieldNames are sent; record type filtering is done from the response. */
+export interface ObjectInfoInput {
+	apiName: string;
+	fieldNames?: string[] | null;
+}
+
+/** Raw GraphQL response shape for uiapi.objectInfos (flexible for schema casing). */
+export interface ObjectInfosGraphQLResponse {
+	uiapi?: {
+		objectInfos?: Array<Record<string, unknown>>;
+	};
+}
+
+/**
+ * Builds objectInfos query (metadata only). Uses apiNames only — do not pass objectInfoInputs.
+ */
+function buildObjectInfosQuery(): string {
+	return `query GetObjectInfos($apiNames: [String!]!) {
+  uiapi {
+    objectInfos(apiNames: $apiNames) {
+      ApiName
+      label
+      labelPlural
+      nameFields
+      defaultRecordTypeId
+      keyPrefix
+      layoutable
+      queryable
+      searchable
+      updateable
+      deletable
+      createable
+      custom
+      mruEnabled
+      feedEnabled
+      fields {
+        ApiName
+        label
+        dataType
+        relationshipName
+        reference
+        compound
+        compoundFieldName
+        compoundComponentName
+        controllingFields
+        controllerName
+        referenceToInfos {
+          ApiName
+          nameFields
+        }
+      }
+      recordTypeInfos {
+        recordTypeId
+        name
+        master
+        available
+        defaultRecordTypeMapping
+      }
+      themeInfo {
+        color
+        iconUrl
+      }
+      childRelationships {
+        relationshipName
+        fieldName
+        childObjectApiName
+      }
+      dependentFields {
+        controllingField
+      }
+    }
+  }
+}`;
+}
+
+/**
+ * Builds objectInfos query with picklist values (API v65.0+).
+ * Schema requires objectInfos to be called with either apiNames or objectInfoInputs, not both.
+ * This query uses objectInfoInputs only.
+ */
+function buildObjectInfosWithPicklistsQuery(): string {
+	return `query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
+  uiapi {
+    objectInfos(objectInfoInputs: $objectInfoInputs) {
+      ApiName
+      label
+      labelPlural
+      nameFields
+      defaultRecordTypeId
+      keyPrefix
+      layoutable
+      queryable
+      searchable
+      updateable
+      deletable
+      createable
+      custom
+      mruEnabled
+      feedEnabled
+      fields {
+        ApiName
+        label
+        dataType
+        relationshipName
+        reference
+        compound
+        compoundFieldName
+        compoundComponentName
+        controllingFields
+        controllerName
+        referenceToInfos {
+          ApiName
+          nameFields
+        }
+        ... on PicklistField {
+          picklistValuesByRecordTypeIDs {
+            recordTypeID
+            defaultValue {
+              value
+            }
+            picklistValues {
+              label
+              value
+              validFor
+            }
+          }
+        }
+      }
+      recordTypeInfos {
+        recordTypeId
+        name
+        master
+        available
+        defaultRecordTypeMapping
+      }
+      themeInfo {
+        color
+        iconUrl
+      }
+      childRelationships {
+        relationshipName
+        fieldName
+        childObjectApiName
+      }
+      dependentFields {
+        controllingField
+      }
+    }
+  }
+}`;
+}
+
+/**
+ * Fetches object metadata for the given objects via GraphQL.
+ *
+ * @param apiNames - Object API names (e.g. ["Account", "Contact"]).
+ * @param options.objectInfoInputs - When set, picklist values for specified fields are included (API v65.0+).
+ * @param options.signal - Optional abort signal.
+ * @returns Raw uiapi.objectInfos response (adapt to REST shape via graphQLObjectInfosToBatchResponse).
+ */
+export async function getObjectInfosGraphQL(
+	apiNames: string[],
+	options?: {
+		objectInfoInputs?: ObjectInfoInput[] | null;
+		signal?: AbortSignal;
+	},
+): Promise<ObjectInfosGraphQLResponse> {
+	const names = apiNames.length ? apiNames : [];
+	const hasInputs = options?.objectInfoInputs != null && options.objectInfoInputs.length > 0;
+	const query = hasInputs ? buildObjectInfosWithPicklistsQuery() : buildObjectInfosQuery();
+	const variables: Record<string, unknown> = hasInputs
+		? { objectInfoInputs: options!.objectInfoInputs }
+		: { apiNames: names };
+	const data = await getDataSDK();
+	const response = await data.graphql?.<ObjectInfosGraphQLResponse>(query, variables);
+
+	if (response?.errors?.length) {
+		const errorMessages = response.errors.map((e) => e.message).join("; ");
+		throw new Error(`GraphQL Error: ${errorMessages}`);
+	}
+
+	return response?.data ?? ({} as ObjectInfosGraphQLResponse);
+}

package/lib/templates/project/reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/api/objectInfoService.ts

@@ -0,0 +1,199 @@
+import { uiApiClient } from "@salesforce/webapp-experimental/api";
+import { z } from "zod";
+import type { SearchResultsResponse, KeywordSearchResult } from "../types/search/searchResults";
+import { SearchResultsResponseSchema } from "../types/search/searchResults";
+import { FilterCriteriaArraySchema } from "../types/filters/filters";
+import type { Filter } from "../types/filters/filters";
+import { FilterArraySchema } from "../types/filters/filters";
+import type { PicklistValue } from "../types/filters/picklist";
+import type { ObjectInfoBatchResponse } from "../types/objectInfo/objectInfo";
+import { fetchAndValidate, safeEncodePath } from "../utils/apiUtils";
+import { getObjectInfosGraphQL } from "./objectInfoGraphQLService";
+import {
+	graphQLObjectInfosToBatchResponse,
+	extractPicklistValuesFromGraphQLObjectInfo,
+} from "../utils/graphQLObjectInfoAdapter";
+
+/**
+ * Object info and search service.
+ *
+ * - getObjectInfoBatch / getPicklistValues: GraphQL (objectInfoGraphQLService).
+ * - getObjectListFilters, searchResults: REST (search-info, search/results).
+ * Hooks use this service; components do not call it directly.
+ *
+ * @module api/objectInfoService
+ */
+
+/** Cache key: sorted, comma-joined object API names. */
+function getObjectInfoBatchCacheKey(objectApiNames: string): string {
+	const names = objectApiNames
+		.split(",")
+		.map((s) => s.trim())
+		.filter(Boolean);
+	return [...names].sort().join(",");
+}
+
+const objectInfoBatchCache = new Map<string, ObjectInfoBatchResponse>();
+const objectInfoBatchInFlight = new Map<string, Promise<ObjectInfoBatchResponse>>();
+
+/**
+ * Fetches batch object information for the specified objects via GraphQL (uiapi.objectInfos).
+ * Results are cached by object set so List, Home, and Detail views share one request.
+ *
+ * @param objectApiNames - Comma-separated list of object API names (e.g., "Account,AccountBrand")
+ * @param signal - Optional AbortSignal to cancel the request
+ * @returns Promise resolving to the object info batch response (REST-compatible shape)
+ */
+export async function getObjectInfoBatch(
+	objectApiNames: string,
+	signal?: AbortSignal,
+): Promise<ObjectInfoBatchResponse> {
+	const names = objectApiNames
+		.split(",")
+		.map((s) => s.trim())
+		.filter(Boolean);
+	if (names.length === 0) {
+		return { results: [] };
+	}
+	const key = getObjectInfoBatchCacheKey(objectApiNames);
+	const cached = objectInfoBatchCache.get(key);
+	if (cached) return Promise.resolve(cached);
+	const inFlight = objectInfoBatchInFlight.get(key);
+	if (inFlight) return inFlight;
+	const promise = (async () => {
+		try {
+			const response = await getObjectInfosGraphQL(names, { signal });
+			const nodes = response?.uiapi?.objectInfos ?? [];
+			const result = graphQLObjectInfosToBatchResponse(nodes, names);
+			objectInfoBatchCache.set(key, result);
+			return result;
+		} finally {
+			objectInfoBatchInFlight.delete(key);
+		}
+	})();
+	objectInfoBatchInFlight.set(key, promise);
+	return promise;
+}
+
+/**
+ * Fetches list filters for a specific object.
+ * Salesforce Search supports "Search Filters" (refinements) which are configured per object.
+ * This API returns the available filters (e.g., "Close Date", "Stage") that the user
+ * can use to narrow down the search results.
+ * @param objectApiName - The API name of the object (e.g., "Account")
+ * @param signal - Optional AbortSignal to cancel the request
+ * @returns Promise resolving to the search filters array
+ */
+export async function getObjectListFilters(
+	objectApiName: string,
+	signal?: AbortSignal,
+): Promise<Filter[]> {
+	return fetchAndValidate(
+		(abortSignal) =>
+			uiApiClient.get(`/search-info/${safeEncodePath(objectApiName)}/filters`, {
+				signal: abortSignal,
+			}),
+		{
+			schema: FilterArraySchema,
+			errorContext: `filters for ${objectApiName}`,
+			extractData: (data: unknown) => {
+				if (!data) return [];
+				return Array.isArray(data) ? data : (data as { filters?: unknown }).filters || [];
+			},
+			signal,
+		},
+	);
+}
+
+/**
+ * Fetches picklist values for a specific field via GraphQL (uiapi.objectInfos with objectInfoInputs).
+ *
+ * @param objectApiName - The API name of the object (e.g., "Account")
+ * @param fieldName - The API name of the field (e.g., "Type")
+ * @param recordTypeId - Optional record type ID (defaults to "012000000000000AAA" which is the default/master record type)
+ * @param signal - Optional AbortSignal to cancel the request
+ * @returns Promise resolving to an array of picklist values
+ */
+export async function getPicklistValues(
+	objectApiName: string,
+	fieldName: string,
+	recordTypeId: string = "012000000000000AAA",
+	signal?: AbortSignal,
+): Promise<PicklistValue[]> {
+	const response = await getObjectInfosGraphQL([objectApiName], {
+		objectInfoInputs: [
+			{
+				apiName: objectApiName,
+				fieldNames: [fieldName],
+			},
+		],
+		signal,
+	});
+	const nodes = response?.uiapi?.objectInfos ?? [];
+	const node = nodes[0];
+	if (!node) return [];
+	return extractPicklistValuesFromGraphQLObjectInfo(node, fieldName, recordTypeId);
+}
+
+// Zod Schema for Search Parameters
+const SearchParamsSchema = z.object({
+	filters: FilterCriteriaArraySchema.optional(),
+	pageSize: z.number().optional(),
+	pageToken: z.string().optional(),
+	sortBy: z.string().optional(),
+});
+
+/**
+ * Search parameters for keyword search
+ */
+export type SearchParams = z.infer<typeof SearchParamsSchema>;
+
+/**
+ * Performs a keyword search on a specific object.
+ * Returns records that match the text query along with pagination information.
+ *
+ * @param query - The search query string
+ * @param objectApiName - The API name of the object to search (e.g., "Account")
+ * @param params - Optional search parameters (pageSize, pageToken, filters, sortBy)
+ * @param signal - Optional AbortSignal to cancel the request
+ * @returns Promise resolving to the keyword search result with records and pagination tokens
+ */
+export async function searchResults(
+	query: string,
+	objectApiName: string,
+	params?: SearchParams,
+	signal?: AbortSignal,
+): Promise<KeywordSearchResult> {
+	const searchParams = new URLSearchParams({
+		q: query,
+		objectApiName: objectApiName,
+	});
+
+	const body = {
+		filters: params?.filters ?? [],
+		pageSize: params?.pageSize ?? 50,
+		pageToken: params?.pageToken ?? "0",
+		sortBy: params?.sortBy ?? "",
+	};
+
+	const response = await fetchAndValidate<SearchResultsResponse>(
+		(abortSignal) =>
+			uiApiClient.post(`/search/results/keyword?${searchParams.toString()}`, body, {
+				signal: abortSignal,
+			}),
+		{
+			schema: SearchResultsResponseSchema,
+			errorContext: `search results for ${objectApiName} with query "${query}"`,
+			signal,
+		},
+	);
+
+	return response.keywordSearchResult;
+}
+
+export const objectInfoService = {
+	getObjectInfoBatch,
+	getObjectListFilters,
+	getPicklistValues,
+	searchResults,
+};