@salesforce/webapp-template-app-react-sample-b2e-experimental 1.76.0 → 1.77.0

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/features/global-search/types/schema.d.ts

@@ -0,0 +1,200 @@
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = {
+	[_ in K]?: never;
+};
+export type Incremental<T> =
+	| T
+	| { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+	ID: { input: string; output: string };
+	String: { input: string; output: string };
+	Boolean: { input: boolean; output: boolean };
+	Int: { input: number; output: number };
+	Float: { input: number; output: number };
+	Base64: { input: string; output: string };
+	/** An arbitrary precision signed decimal */
+	BigDecimal: { input: number | string; output: number };
+	/** An arbitrary precision signed integer */
+	BigInteger: { input: number; output: number };
+	/** An 8-bit signed integer */
+	Byte: { input: number; output: number };
+	/** A UTF-16 code unit; a character on Unicode's BMP */
+	Char: { input: number; output: number };
+	Currency: { input: number | string; output: number };
+	Date: { input: string; output: string };
+	DateTime: { input: string; output: string };
+	Double: { input: number | string; output: number };
+	Email: { input: string; output: string };
+	EncryptedString: { input: string; output: string };
+	/** Can be set to an ID or a Reference to the result of another mutation operation. */
+	IdOrRef: { input: string; output: string };
+	JSON: { input: string; output: string };
+	Latitude: { input: number | string; output: number };
+	/** A 64-bit signed integer */
+	Long: { input: number; output: number };
+	LongTextArea: { input: string; output: string };
+	Longitude: { input: number | string; output: number };
+	MultiPicklist: { input: string; output: string };
+	Percent: { input: number | string; output: number };
+	PhoneNumber: { input: string; output: string };
+	Picklist: { input: string; output: string };
+	RichTextArea: { input: string; output: string };
+	/** A 16-bit signed integer */
+	Short: { input: number; output: number };
+	TextArea: { input: string; output: string };
+	Time: { input: string; output: string };
+	Url: { input: string; output: string };
+};
+
+export enum DataType {
+	Address = "ADDRESS",
+	Anytype = "ANYTYPE",
+	Base64 = "BASE64",
+	Boolean = "BOOLEAN",
+	Combobox = "COMBOBOX",
+	Complexvalue = "COMPLEXVALUE",
+	Currency = "CURRENCY",
+	Date = "DATE",
+	Datetime = "DATETIME",
+	Double = "DOUBLE",
+	Email = "EMAIL",
+	Encryptedstring = "ENCRYPTEDSTRING",
+	Int = "INT",
+	Json = "JSON",
+	Junctionidlist = "JUNCTIONIDLIST",
+	Location = "LOCATION",
+	Long = "LONG",
+	Multipicklist = "MULTIPICKLIST",
+	Percent = "PERCENT",
+	Phone = "PHONE",
+	Picklist = "PICKLIST",
+	Reference = "REFERENCE",
+	String = "STRING",
+	Textarea = "TEXTAREA",
+	Time = "TIME",
+	Url = "URL",
+}
+
+export enum FieldExtraTypeInfo {
+	ExternalLookup = "EXTERNAL_LOOKUP",
+	ImageUrl = "IMAGE_URL",
+	IndirectLookup = "INDIRECT_LOOKUP",
+	Personname = "PERSONNAME",
+	Plaintextarea = "PLAINTEXTAREA",
+	Richtextarea = "RICHTEXTAREA",
+	SwitchablePersonname = "SWITCHABLE_PERSONNAME",
+}
+
+/** Input for ObjectInfo and PickValues */
+export type ObjectInfoInput = {
+	apiName: Scalars["String"]["input"];
+	fieldNames?: InputMaybe<Array<Scalars["String"]["input"]>>;
+	recordTypeIDs?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+};
+
+export enum ResultOrder {
+	Asc = "ASC",
+	Desc = "DESC",
+}
+
+export type GetObjectInfosQueryVariables = Exact<{
+	apiNames: Array<Scalars["String"]["input"]> | Scalars["String"]["input"];
+}>;
+
+export type GetObjectInfosQuery = {
+	uiapi: {
+		objectInfos?: Array<{
+			ApiName: string;
+			label?: string | null;
+			labelPlural?: string | null;
+			nameFields: Array<string | null>;
+			defaultRecordTypeId?: string | null;
+			keyPrefix?: string | null;
+			layoutable: boolean;
+			queryable: boolean;
+			searchable: boolean;
+			updateable: boolean;
+			deletable: boolean;
+			createable: boolean;
+			custom: boolean;
+			mruEnabled: boolean;
+			feedEnabled: boolean;
+			fields: Array<
+				| {
+						ApiName: string;
+						label?: string | null;
+						dataType?: DataType | null;
+						relationshipName?: string | null;
+						reference: boolean;
+						compound: boolean;
+						compoundFieldName?: string | null;
+						compoundComponentName?: string | null;
+						controllingFields: Array<string | null>;
+						controllerName?: string | null;
+						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
+				  }
+				| {
+						ApiName: string;
+						label?: string | null;
+						dataType?: DataType | null;
+						relationshipName?: string | null;
+						reference: boolean;
+						compound: boolean;
+						compoundFieldName?: string | null;
+						compoundComponentName?: string | null;
+						controllingFields: Array<string | null>;
+						controllerName?: string | null;
+						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
+				  }
+				| null
+			>;
+			recordTypeInfos: Array<{
+				recordTypeId?: string | null;
+				name?: string | null;
+				master: boolean;
+				available: boolean;
+				defaultRecordTypeMapping: boolean;
+			} | null>;
+			themeInfo?: { color?: string | null; iconUrl?: string | null } | null;
+			childRelationships: Array<{
+				relationshipName?: string | null;
+				fieldName?: string | null;
+				childObjectApiName: string;
+			} | null>;
+			dependentFields: Array<{ controllingField: string } | null>;
+		} | null> | null;
+	};
+};
+
+export type GetPicklistValuesQueryVariables = Exact<{
+	objectInfoInputs: Array<ObjectInfoInput> | ObjectInfoInput;
+}>;
+
+export type GetPicklistValuesQuery = {
+	uiapi: {
+		objectInfos?: Array<{
+			ApiName: string;
+			fields: Array<
+				| {
+						ApiName: string;
+						picklistValuesByRecordTypeIDs?: Array<{
+							recordTypeID: string;
+							defaultValue?: { value?: string | null } | null;
+							picklistValues?: Array<{
+								label?: string | null;
+								value?: string | null;
+								validFor?: Array<number | null> | null;
+							}> | null;
+						} | null> | null;
+				  }
+				| { ApiName: string }
+				| null
+			>;
+		} | null> | null;
+	};
+};

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/features/global-search/utils/apiUtils.ts

@@ -2,77 +2,31 @@
  * API Utilities
  *
  * Generic utility functions for API requests, validation, and URL handling.
- * These utilities are framework-agnostic and can be reused across different API services.
  */
 
 import type { ZodSchema } from "zod";
 
-/**
- * Options for fetchAndValidate utility function
- */
 export interface FetchAndValidateOptions<T> {
-	/** Zod schema for validation */
 	schema: ZodSchema<T>;
-	/** Error context for better error messages (e.g., "object info batch", "list info") */
 	errorContext: string;
-	/** Optional function to extract/transform data from response before validation */
 	extractData?: (data: unknown) => unknown;
-	/** Optional AbortSignal to cancel the request */
-	signal?: AbortSignal;
 }
 
-/**
- * Generic utility function to fetch, parse, and validate API responses.
- * Handles common patterns: fetch -> check status -> parse JSON -> validate Zod -> handle errors
- *
- * @param fetchFn - Function that returns a Promise<Response> (e.g., uiApiClient.get or uiApiClient.post)
- * @param options - Configuration options including schema, error context, optional data extraction, and AbortSignal
- * @returns Promise resolving to validated data of type T
- *
- * @remarks
- * - Handles abort signals properly to prevent race conditions
- * - Provides detailed error messages with context
- * - Validates responses using Zod schemas for type safety
- * - Supports data extraction/transformation before validation
- *
- * @example
- * ```tsx
- * const data = await fetchAndValidate(
- *   (signal) => apiClient.get('/endpoint', { signal }),
- *   {
- *     schema: MySchema,
- *     errorContext: 'user data',
- *     extractData: (data) => data.items,
- *     signal: abortController.signal
- *   }
- * );
- * ```
- */
 export async function fetchAndValidate<T>(
-	fetchFn: (signal?: AbortSignal) => Promise<Response>,
+	fetchFn: () => Promise<Response>,
 	options: FetchAndValidateOptions<T>,
 ): Promise<T> {
-	const { schema, errorContext, extractData, signal } = options;
+	const { schema, errorContext, extractData } = options;
 
 	try {
-		const response = await fetchFn(signal);
-
-		if (signal?.aborted) {
-			throw new DOMException("The operation was aborted.", "AbortError");
-		}
+		const response = await fetchFn();
 
 		if (!response.ok) {
 			throw new Error(`Failed to fetch ${errorContext}: ${response.status} ${response.statusText}`);
 		}
 
 		const data = await response.json();
-
-		if (signal?.aborted) {
-			throw new DOMException("The operation was aborted.", "AbortError");
-		}
-
 		const dataToValidate = extractData ? extractData(data) : data;
-
 		const validationResult = schema.safeParse(dataToValidate);
 
 		if (!validationResult.success) {
@@ -81,14 +35,6 @@ export async function fetchAndValidate<T>(
 
 		return validationResult.data;
 	} catch (error) {
-		if (error instanceof DOMException && error.name === "AbortError") {
-			throw error;
-		}
-
-		if (error instanceof Error && error.name === "AbortError") {
-			throw error;
-		}
-
 		if (error instanceof Error && error.name === "ZodError") {
 			throw new Error(`Invalid ${errorContext} response format: ${error.message}`);
 		}
@@ -108,18 +54,6 @@ export async function fetchAndValidate<T>(
 	}
 }
 
-/**
- * Helper to safely encode path components for URLs
- * Wraps encodeURIComponent for better semantic meaning
- *
- * @param segment - The path segment to encode
- * @returns URL-encoded path segment
- *
- * @example
- * ```tsx
- * const safePath = safeEncodePath('Account Name'); // 'Account%20Name'
- * ```
- */
 export function safeEncodePath(segment: string): string {
 	return encodeURIComponent(segment);
 }

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/features/global-search/utils/graphQLObjectInfoAdapter.ts

@@ -10,259 +10,36 @@
 
 import type {
 	ObjectInfoBatchResponse,
+	GetObjectInfosQueryObjectInfos,
+	GetPicklistValuesQueryObjectInfo,
+	GetPicklistValuesQueryField,
+	GetObjectInfosQueryObjectInfo,
 	ObjectInfoResult,
-	Field,
-	RecordTypeInfo,
-	ThemeInfo,
+	PicklistValue as GraphQLPicklistValue,
 } from "../types/objectInfo/objectInfo";
 import type { PicklistValue } from "../types/filters/picklist";
 
-type GraphQLNode = Record<string, unknown>;
-
-function getStr(node: GraphQLNode, key: string): string {
-	const v = node[key] ?? node[key.charAt(0).toLowerCase() + key.slice(1)];
-	return typeof v === "string" ? v : "";
-}
-
-function getNum(node: GraphQLNode, key: string): number {
-	const v = node[key] ?? node[key.charAt(0).toLowerCase() + key.slice(1)];
-	return typeof v === "number" ? v : 0;
-}
-
-function getBool(node: GraphQLNode, key: string): boolean {
-	const v = node[key] ?? node[key.charAt(0).toLowerCase() + key.slice(1)];
-	return typeof v === "boolean" ? v : false;
-}
-
-function getArr<T>(node: GraphQLNode, key: string, map: (item: unknown) => T): T[] {
-	const v = node[key] ?? node[key.charAt(0).toLowerCase() + key.slice(1)];
-	if (!Array.isArray(v)) return [];
-	return v.map((item) => map(item));
-}
-
-function getObj(node: GraphQLNode, key: string): Record<string, unknown> {
-	const v = node[key] ?? node[key.charAt(0).toLowerCase() + key.slice(1)];
-	return v != null && typeof v === "object" && !Array.isArray(v)
-		? (v as Record<string, unknown>)
-		: {};
-}
-
-/** GraphQL returns dependentFields as [DependentField]; REST expects Record. Normalize to object. */
-function toDependentFieldsRecord(v: unknown): Record<string, unknown> {
-	if (v == null) return {};
-	if (Array.isArray(v)) return {};
-	return typeof v === "object" ? (v as Record<string, unknown>) : {};
-}
-
-/** Canonical dataType casing for formatters (Phone, FormattedAddress) and reference resolution (Reference). */
-const DATA_TYPE_CANONICAL: Record<string, string> = {
-	phone: "Phone",
-	email: "Email",
-	url: "Url",
-	address: "Address",
-	reference: "Reference",
-};
-
-function normalizeDataType(raw: string): string {
-	if (!raw) return raw;
-	const lower = raw.toLowerCase();
-	return DATA_TYPE_CANONICAL[lower] ?? raw;
-}
-
-/** Normalize GraphQL Field to our Field type (REST-compatible). */
-function mapField(fieldNode: unknown): [string, Field] {
-	const n = (fieldNode != null && typeof fieldNode === "object" ? fieldNode : {}) as GraphQLNode;
-	const apiName = getStr(n, "ApiName") || getStr(n, "apiName");
-	const label = getStr(n, "label");
-	const dataType = normalizeDataType(getStr(n, "dataType"));
-	const relationshipName = getStr(n, "relationshipName") || null;
-	const reference = getBool(n, "reference");
-	const compound = getBool(n, "compound");
-	const compoundFieldName = getStr(n, "compoundFieldName") || null;
-	const compoundComponentName = getStr(n, "compoundComponentName") || null;
-	const controllingFields = getArr(n, "controllingFields", String);
-	const controllerName = getStr(n, "controllerName") || null;
-	const referenceToInfos = getArr(n, "referenceToInfos", (item) => {
-		const r = (item != null && typeof item === "object" ? item : {}) as GraphQLNode;
-		return {
-			apiName: getStr(r, "apiName") || getStr(r, "ApiName"),
-			nameFields: getArr(r, "nameFields", String),
-		};
-	});
-	return [
-		apiName,
-		{
-			apiName,
-			label,
-			dataType,
-			relationshipName,
-			reference,
-			compound,
-			compoundFieldName,
-			compoundComponentName,
-			controllingFields,
-			controllerName,
-			referenceToInfos,
-			calculated: getBool(n, "calculated"),
-			createable: getBool(n, "createable"),
-			custom: getBool(n, "custom"),
-			defaultValue: n.defaultValue ?? null,
-			defaultedOnCreate: getBool(n, "defaultedOnCreate"),
-			digits: getNum(n, "digits"),
-			externalId: getBool(n, "externalId"),
-			extraTypeInfo: getStr(n, "extraTypeInfo") || null,
-			filterable: getBool(n, "filterable"),
-			filteredLookupInfo: null,
-			highScaleNumber: getBool(n, "highScaleNumber"),
-			htmlFormatted: getBool(n, "htmlFormatted"),
-			inlineHelpText: getStr(n, "inlineHelpText") || null,
-			length: getNum(n, "length"),
-			maskType: getStr(n, "maskType") || null,
-			nameField: getBool(n, "nameField"),
-			polymorphicForeignKey: getBool(n, "polymorphicForeignKey"),
-			precision: getNum(n, "precision"),
-			required: getBool(n, "required"),
-			scale: getNum(n, "scale"),
-			searchPrefilterable: getBool(n, "searchPrefilterable"),
-			sortable: getBool(n, "sortable"),
-			unique: getBool(n, "unique"),
-			updateable: getBool(n, "updateable"),
-			referenceTargetField: getStr(n, "referenceTargetField") || null,
-		} as Field,
-	];
-}
-
-/** Normalize GraphQL recordTypeInfo to RecordTypeInfo. */
-function mapRecordTypeInfo(rtNode: unknown): [string, RecordTypeInfo] {
-	const n = (rtNode != null && typeof rtNode === "object" ? rtNode : {}) as GraphQLNode;
-	const recordTypeId = getStr(n, "recordTypeId");
-	return [
-		recordTypeId,
-		{
-			recordTypeId,
-			name: getStr(n, "name"),
-			master: getBool(n, "master"),
-			available: getBool(n, "available"),
-			defaultRecordTypeMapping: getBool(n, "defaultRecordTypeMapping"),
-		} as RecordTypeInfo,
-	];
-}
-
-function toFieldsMap(fieldsNode: unknown): Record<string, Field> {
-	if (fieldsNode == null) return {};
-	if (Array.isArray(fieldsNode)) {
-		return Object.fromEntries((fieldsNode as unknown[]).map(mapField).filter(([k]) => k));
-	}
-	if (typeof fieldsNode === "object" && !Array.isArray(fieldsNode)) {
-		const entries = Object.entries(fieldsNode as Record<string, unknown>).map(([, v]) =>
-			mapField(v),
-		);
-		return Object.fromEntries(entries.filter(([k]) => k));
-	}
-	return {};
-}
-
-/**
- * Ensures compound parent fields (e.g. BillingAddress, ShippingAddress) exist in the fields map
- * with dataType "Address" so layout transform can set item.dataType for FormattedAddress.
- * GraphQL may only return component fields (BillingStreet, etc.) with compoundFieldName.
- */
-function ensureCompoundParentFields(fields: Record<string, Field>): Record<string, Field> {
-	const result = { ...fields };
-	for (const field of Object.values(fields)) {
-		const compoundName = field.compoundFieldName;
-		if (!compoundName || result[compoundName] != null) continue;
-		const dataType =
-			compoundName.endsWith("Address") || compoundName.endsWith("address") ? "Address" : "String";
-		result[compoundName] = {
-			...field,
-			apiName: compoundName,
-			label: compoundName,
-			dataType,
-			compound: true,
-			compoundFieldName: null,
-			compoundComponentName: null,
-		} as Field;
-	}
-	return result;
-}
-
-function toRecordTypeInfosMap(rtNode: unknown): Record<string, RecordTypeInfo> {
-	if (rtNode == null) return {};
-	if (Array.isArray(rtNode)) {
-		return Object.fromEntries((rtNode as unknown[]).map(mapRecordTypeInfo).filter(([k]) => k));
-	}
-	if (typeof rtNode === "object" && !Array.isArray(rtNode)) {
-		const entries = Object.entries(rtNode as Record<string, unknown>).map(([, v]) =>
-			mapRecordTypeInfo(v),
-		);
-		return Object.fromEntries(entries.filter(([k]) => k));
-	}
-	return {};
-}
-
-/** Map a single GraphQL ObjectInfo node to ObjectInfoResult (REST-compatible). */
-export function graphQLObjectInfoToObjectInfoResult(node: GraphQLNode): ObjectInfoResult {
-	const themeInfoNode = getObj(node, "themeInfo");
-	const themeInfo: ThemeInfo = {
-		color: getStr(themeInfoNode, "color"),
-		iconUrl: getStr(themeInfoNode, "iconUrl"),
-	};
-
-	const childRelationships = getArr(node, "childRelationships", (item) => {
-		const c = (item != null && typeof item === "object" ? item : {}) as GraphQLNode;
-		return {
-			childObjectApiName: getStr(c, "childObjectApiName"),
-			fieldName: getStr(c, "fieldName"),
-			junctionIdListNames: getArr(c, "junctionIdListNames", String),
-			junctionReferenceTo: getArr(c, "junctionReferenceTo", String),
-			relationshipName: getStr(c, "relationshipName"),
-		};
-	});
-
-	const apiName = getStr(node, "ApiName") || getStr(node, "apiName");
-	const fieldsNode = node.fields ?? node.Fields;
-	const recordTypeInfosNode = node.recordTypeInfos ?? node.RecordTypeInfos;
-
+export function graphQLObjectInfoToObjectInfoResult(
+	objectInfo: GetObjectInfosQueryObjectInfo,
+): ObjectInfoResult {
+	const { fields, ...rest } = objectInfo;
+	const fieldsRecord = Object.fromEntries((fields ?? []).map((field) => [field?.ApiName, field]));
 	return {
-		apiName,
-		label: getStr(node, "label"),
-		labelPlural: getStr(node, "labelPlural"),
-		nameFields: getArr(node, "nameFields", String),
-		defaultRecordTypeId: getStr(node, "defaultRecordTypeId") || "012000000000000AAA",
-		keyPrefix: getStr(node, "keyPrefix"),
-		layoutable: getBool(node, "layoutable"),
-		queryable: getBool(node, "queryable"),
-		searchable: getBool(node, "searchable"),
-		updateable: getBool(node, "updateable"),
-		deletable: getBool(node, "deletable"),
-		createable: getBool(node, "createable"),
-		custom: getBool(node, "custom"),
-		mruEnabled: getBool(node, "mruEnabled"),
-		feedEnabled: getBool(node, "feedEnabled"),
-		fields: ensureCompoundParentFields(toFieldsMap(fieldsNode)),
-		recordTypeInfos: toRecordTypeInfosMap(recordTypeInfosNode),
-		themeInfo,
-		childRelationships,
-		associateEntityType: getStr(node, "associateEntityType") || null,
-		associateParentEntity: getStr(node, "associateParentEntity") || null,
-		compactLayoutable: getBool(node, "compactLayoutable"),
-		searchLayoutable: getBool(node, "searchLayoutable"),
-		dependentFields: toDependentFieldsRecord(node.dependentFields ?? node.DependentFields),
-		eTag: getStr(node, "eTag"),
-	} as ObjectInfoResult;
+		...rest,
+		fields: fieldsRecord,
+	};
 }
 
 /** Convert GraphQL objectInfos array to ObjectInfoBatchResponse (REST shape). */
 export function graphQLObjectInfosToBatchResponse(
-	nodes: GraphQLNode[],
+	objectInfos: GetObjectInfosQueryObjectInfos,
 	_requestedApiNames: string[],
 ): ObjectInfoBatchResponse {
-	const results = nodes.map((node) => ({
-		result: graphQLObjectInfoToObjectInfoResult(node),
+	const results = objectInfos.map((objectInfo) => ({
+		result: graphQLObjectInfoToObjectInfoResult(objectInfo!),
 		statusCode: 200,
 	}));
-	return { results } as ObjectInfoBatchResponse;
+	return { results };
 }
 
 /**
@@ -270,50 +47,31 @@ export function graphQLObjectInfosToBatchResponse(
  * Uses picklistValuesByRecordTypeIDs; prefers the given recordTypeId or first available.
  */
 export function extractPicklistValuesFromGraphQLObjectInfo(
-	node: GraphQLNode,
+	objectInfo: NonNullable<GetPicklistValuesQueryObjectInfo>,
 	fieldName: string,
 	recordTypeId?: string,
 ): PicklistValue[] {
-	const fieldsNode = node.fields ?? node.Fields;
-	if (fieldsNode == null || typeof fieldsNode !== "object") return [];
-	const fieldMap = Array.isArray(fieldsNode)
-		? Object.fromEntries(
-				(fieldsNode as unknown[]).map((f: unknown) => {
-					const n = (f != null && typeof f === "object" ? f : {}) as GraphQLNode;
-					const k = getStr(n, "ApiName") || getStr(n, "apiName");
-					return [k, n];
-				}),
-			)
-		: (fieldsNode as Record<string, GraphQLNode>);
+	const fields = objectInfo.fields;
+	if (fields == null) return [];
+	const fieldMap: Record<string, GetPicklistValuesQueryField> = Object.fromEntries(
+		fields.map((field) => {
+			return [field?.ApiName, field];
+		}),
+	);
 	const field = fieldMap[fieldName];
-	if (!field || typeof field !== "object") return [];
-	const picklistData = field.picklistValuesByRecordTypeIDs ?? field.PicklistValuesByRecordTypeIDs;
-	if (!picklistData || !Array.isArray(picklistData)) return [];
+	if (!field) return [];
+	const picklistData =
+		"picklistValuesByRecordTypeIDs" in field ? field.picklistValuesByRecordTypeIDs : undefined;
+	if (!picklistData) return [];
 	const rtId = recordTypeId ?? "012000000000000AAA";
-	const arr = picklistData as Array<Record<string, unknown>>;
-	const byRecordType = arr.find((p) => (p.recordTypeID ?? p.recordTypeId) === rtId);
-	if (!byRecordType) {
-		const first = arr[0];
-		if (!first) return [];
-		return mapPicklistValues(first);
-	}
-	return mapPicklistValues(byRecordType);
+	const byRecordType = picklistData.find((p) => p!.recordTypeID === rtId) ?? picklistData[0];
+	return mapPicklistValues(byRecordType?.picklistValues ?? []);
 }
 
-function mapPicklistValues(byRecordType: Record<string, unknown>): PicklistValue[] {
-	const raw = byRecordType.picklistValues;
-	if (!Array.isArray(raw)) return [];
-	return raw.map((item: unknown) => {
-		const n = (item != null && typeof item === "object" ? item : {}) as Record<string, unknown>;
-		return {
-			label: typeof n.label === "string" ? n.label : "",
-			value: typeof n.value === "string" ? n.value : "",
-			validFor: Array.isArray(n.validFor) ? n.validFor : undefined,
-			attributes: (n.attributes != null && typeof n.attributes === "object"
-				? n.attributes
-				: undefined) as Record<string, unknown> | undefined,
-			defaultValue: typeof n.defaultValue === "boolean" ? n.defaultValue : undefined,
-			active: typeof n.active === "boolean" ? n.active : undefined,
-		} as PicklistValue;
-	});
+function mapPicklistValues(values: GraphQLPicklistValue[]): PicklistValue[] {
+	return values.map((item) => ({
+		...item,
+		value: item.value ?? "",
+		label: item.label ?? "",
+	}));
 }