@uipath/uipath-typescript 1.4.0 → 1.4.2

package/dist/entities/index.mjs

@@ -1276,12 +1276,18 @@ class PaginationHelpers {
      * @returns Promise resolving to a paginated result
      */
     static async getAllPaginated(params) {
-        const { serviceAccess, getEndpoint, folderId, headers: providedHeaders, paginationParams, additionalParams, transformFn, method = HTTP_METHODS.GET, options = {} } = params;
+        const { serviceAccess, getEndpoint, folderId, headers: providedHeaders, paginationParams, additionalParams, queryParams, transformFn, method = HTTP_METHODS.GET, options = {} } = params;
         const endpoint = getEndpoint(folderId);
         const headers = providedHeaders ?? (folderId ? createHeaders({ [FOLDER_ID]: folderId }) : {});
+        // On POST, the caller's options go in the body; queryParams stays in the URL.
+        // On GET, everything is URL — queryParams merges with additionalParams.
+        const isPost = method === HTTP_METHODS.POST;
+        const requestSpec = isPost
+            ? { body: additionalParams, params: queryParams }
+            : { params: { ...additionalParams, ...queryParams } };
         const paginatedResponse = await serviceAccess.requestWithPagination(method, endpoint, paginationParams, {
             headers,
-            params: additionalParams,
+            ...requestSpec,
             pagination: {
                 paginationType: options.paginationType || PaginationType.OFFSET,
                 itemsField: options.itemsField || DEFAULT_ITEMS_FIELD,
@@ -1306,7 +1312,7 @@ class PaginationHelpers {
      * @returns Promise resolving to an object with data and totalCount
      */
     static async getAllNonPaginated(params) {
-        const { serviceAccess, getAllEndpoint, getByFolderEndpoint, folderId, headers: providedHeaders, additionalParams, transformFn, method = HTTP_METHODS.GET, options = {} } = params;
+        const { serviceAccess, getAllEndpoint, getByFolderEndpoint, folderId, headers: providedHeaders, additionalParams, queryParams, transformFn, method = HTTP_METHODS.GET, options = {} } = params;
         // Set default field names
         const itemsField = options.itemsField || DEFAULT_ITEMS_FIELD;
         const totalCountField = options.totalCountField || DEFAULT_TOTAL_COUNT_FIELD;
@@ -1316,11 +1322,11 @@ class PaginationHelpers {
         // Make the API call based on method
         let response;
         if (method === HTTP_METHODS.POST) {
-            response = await serviceAccess.post(endpoint, additionalParams, { headers });
+            response = await serviceAccess.post(endpoint, additionalParams, { headers, params: queryParams });
         }
         else {
             response = await serviceAccess.get(endpoint, {
-                params: additionalParams,
+                params: { ...additionalParams, ...queryParams },
                 headers
             });
         }
@@ -1375,6 +1381,7 @@ class PaginationHelpers {
                 headers: config.headers,
                 paginationParams: cursor ? { cursor, pageSize } : jumpToPage !== undefined ? { jumpToPage, pageSize } : { pageSize },
                 additionalParams: prefixedOptions,
+                queryParams: config.queryParams,
                 transformFn: config.transformFn,
                 method: config.method,
                 options: {
@@ -1392,6 +1399,7 @@ class PaginationHelpers {
             folderId,
             headers: config.headers,
             additionalParams: prefixedOptions,
+            queryParams: config.queryParams,
             transformFn: config.transformFn,
             method: config.method,
             options: {
@@ -1583,18 +1591,17 @@ class BaseService {
         const params = this.validateAndPreparePaginationParams(paginationType, paginationOptions);
         // Prepare request parameters based on pagination type
         const requestParams = this.preparePaginationRequestParams(paginationType, params, options.pagination);
-        // For POST requests, merge pagination params into body and set params to undefined; for GET, use query params
+        // Route pagination state to wherever the API expects it (body for POST, URL for GET).
+        // Caller-supplied options.body / options.params are respected as-is — the api-client
+        // already handles params (URL) and body (request body) independently for every method.
         if (method.toUpperCase() === 'POST') {
             const existingBody = (options.body && typeof options.body === 'object') ? options.body : {};
             options.body = {
                 ...existingBody,
-                ...options.params,
                 ...requestParams
             };
-            options.params = undefined;
         }
         else {
-            // Merge pagination parameters with existing parameters
             options.params = {
                 ...options.params,
                 ...requestParams
@@ -1960,6 +1967,9 @@ const DATA_FABRIC_TENANT_FOLDER_ID = '00000000-0000-0000-0000-000000000000';
 const DATA_FABRIC_ENDPOINTS = {
     ENTITY: {
         GET_ALL: `${DATAFABRIC_BASE}/api/Entity`,
+        // Lists tenant-level and folder-level entities together.
+        // Used by getAll when includeFolderEntities is true.
+        GET_ALL_V2: `${DATAFABRIC_BASE}/api/v2/Entity`,
         GET_ENTITY_RECORDS: (entityId) => `${DATAFABRIC_BASE}/api/EntityService/entity/${entityId}/read`,
         GET_BY_ID: (entityId) => `${DATAFABRIC_BASE}/api/Entity/${entityId}`,
         GET_RECORD_BY_ID: (entityId, recordId) => `${DATAFABRIC_BASE}/api/EntityService/entity/${entityId}/read/${recordId}`,
@@ -2058,6 +2068,14 @@ var SqlFieldType;
     SqlFieldType["MULTILINE"] = "MULTILINE";
 })(SqlFieldType || (SqlFieldType = {}));
 
+/**
+ * Numeric type IDs that pair with {@link EntityType} on reference payloads
+ * (entityType + entityTypeId travel together in `referenceEntity` /
+ * `referenceChoiceSet` bodies on cross-folder schema upserts).
+ */
+const ENTITY_TYPE_IDS = {
+    [EntityType.ChoiceSet]: 1,
+};
 /**
  * Maps fields for Entities
  */
@@ -2220,7 +2238,7 @@ class EntityService extends BaseService {
      * Gets entity metadata by entity ID with attached operation methods
      *
      * @param id - UUID of the entity
-     * @param options - Optional {@link EntityGetByIdOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityGetByIdOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to entity metadata with schema information and operation methods
      *
      * @example
@@ -2260,7 +2278,7 @@ class EntityService extends BaseService {
      * Gets entity records by entity ID
      *
      * @param entityId - UUID of the entity
-     * @param options - Query options including expansionLevel and pagination options
+     * @param options - Query options including expansionLevel and pagination options The `folderKey` property is **experimental**.
      * @returns Promise resolving to an array of entity records or paginated response
      *
      * @example
@@ -2288,6 +2306,9 @@ class EntityService extends BaseService {
      *   cursor: paginatedResponse.nextCursor,
      *   expansionLevel: 1
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * const records = await entities.getAllRecords("<entityId>", { folderKey: "<folderKey>" });
      * ```
      */
     async getAllRecords(entityId, options) {
@@ -2317,7 +2338,7 @@ class EntityService extends BaseService {
      *
      * @param entityId - UUID of the entity
      * @param recordId - UUID of the record
-     * @param options - Query options including expansionLevel
+     * @param options - Query options including `expansionLevel` and `folderKey` The `folderKey` property is **experimental**.
      * @returns Promise resolving to the entity record
      *
      * @example
@@ -2329,6 +2350,11 @@ class EntityService extends BaseService {
      * const record = await sdk.entities.getRecordById(<entityId>, <recordId>, {
      *   expansionLevel: 1
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * const record = await sdk.entities.getRecordById(<entityId>, <recordId>, {
+     *   folderKey: "<folderKey>"
+     * });
      * ```
      */
     async getRecordById(entityId, recordId, options = {}) {
@@ -2343,7 +2369,7 @@ class EntityService extends BaseService {
      *
      * @param entityId - UUID of the entity
      * @param data - Record to insert
-     * @param options - Insert options
+     * @param options - Insert options The `folderKey` property is **experimental**.
      * @returns Promise resolving to the inserted record with generated record ID
      *
      * @example
@@ -2359,6 +2385,11 @@ class EntityService extends BaseService {
      * const result = await entities.insertRecordById("<entityId>", { name: "John", age: 30 }, {
      *   expansionLevel: 1
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.insertRecordById("<entityId>", { name: "John", age: 30 }, {
+     *   folderKey: "<folderKey>"
+     * });
      * ```
      */
     async insertRecordById(id, data, options = {}) {
@@ -2376,7 +2407,7 @@ class EntityService extends BaseService {
      *
      * @param entityId - UUID of the entity
      * @param data - Array of records to insert
-     * @param options - Insert options
+     * @param options - Insert options The `folderKey` property is **experimental**.
      * @returns Promise resolving to insert response
      *
      * @example
@@ -2399,6 +2430,12 @@ class EntityService extends BaseService {
      *   expansionLevel: 1,
      *   failOnFirst: true
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.insertRecordsById("<entityId>", [
+     *   { name: "John", age: 30 },
+     *   { name: "Jane", age: 25 }
+     * ], { folderKey: "<folderKey>" });
      * ```
      */
     async insertRecordsById(id, data, options = {}) {
@@ -2418,7 +2455,7 @@ class EntityService extends BaseService {
      * @param entityId - UUID of the entity
      * @param recordId - UUID of the record to update
      * @param data - Key-value pairs of fields to update
-     * @param options - Update options
+     * @param options - Update options The `folderKey` property is **experimental**.
      * @returns Promise resolving to the updated record
      *
      * @example
@@ -2434,6 +2471,11 @@ class EntityService extends BaseService {
      * const result = await entities.updateRecordById("<entityId>", "<recordId>", { name: "John Updated", age: 31 }, {
      *   expansionLevel: 1
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.updateRecordById("<entityId>", "<recordId>", { name: "John Updated" }, {
+     *   folderKey: "<folderKey>"
+     * });
      * ```
      */
     async updateRecordById(entityId, recordId, data, options = {}) {
@@ -2452,7 +2494,7 @@ class EntityService extends BaseService {
      * @param entityId - UUID of the entity
      * @param data - Array of records to update. Each record MUST contain the record Id,
      *               otherwise the update will fail.
-     * @param options - Update options
+     * @param options - Update options The `folderKey` property is **experimental**.
      * @returns Promise resolving to update response
      *
      * @example
@@ -2475,6 +2517,11 @@ class EntityService extends BaseService {
      *   expansionLevel: 1,
      *   failOnFirst: true
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.updateRecordsById("<entityId>", [
+     *   { Id: "123", name: "John Updated" }
+     * ], { folderKey: "<folderKey>" });
      * ```
      */
     async updateRecordsById(id, data, options = {}) {
@@ -2495,7 +2542,7 @@ class EntityService extends BaseService {
      *
      * @param entityId - UUID of the entity
      * @param recordIds - Array of record UUIDs to delete
-     * @param options - Delete options
+     * @param options - Delete options The `folderKey` property is **experimental**.
      * @returns Promise resolving to delete response
      *
      * @example
@@ -2508,6 +2555,11 @@ class EntityService extends BaseService {
      * const result = await entities.deleteRecordsById("<entityId>", [
      *   "<recordId-1>", "<recordId-2>"
      * ]);
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.deleteRecordsById("<entityId>", [
+     *   "<recordId-1>", "<recordId-2>"
+     * ], { folderKey: "<folderKey>" });
      * ```
      */
     async deleteRecordsById(id, recordIds, options = {}) {
@@ -2528,7 +2580,7 @@ class EntityService extends BaseService {
      *
      * @param entityId - UUID of the entity
      * @param recordId - UUID of the record to delete
-     * @param options - Optional {@link EntityDeleteRecordByIdOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityDeleteRecordByIdOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to void on success
      * @example
      * ```typescript
@@ -2546,8 +2598,14 @@ class EntityService extends BaseService {
         await this.delete(DATA_FABRIC_ENDPOINTS.ENTITY.DELETE_RECORD_BY_ID(entityId, recordId), { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
     }
     /**
-     * Gets all entities in the system
+     * Gets entities in the tenant.
+     *
+     * Three call modes:
+     * - `getAll()` — default. Returns only tenant-level entities.
+     * - `getAll({ folderKey: "<uuid>" })` — preferred for folder-scoped data. Returns only entities in that folder.
+     * - `getAll({ includeFolderEntities: true })` — returns tenant-level **and** folder-level entities together. `folderKey` is preferred over `includeFolderEntities` when both are set.
      *
+     * @param options - Optional {@link EntityGetAllOptions} (`folderKey` to list a single folder's entities — preferred when scoping to a folder; `includeFolderEntities: true` to list tenant + folder entities together) The `folderKey` property is **experimental**.
      * @returns Promise resolving to an array of entity metadata
      *
      * @example
@@ -2556,15 +2614,29 @@ class EntityService extends BaseService {
      *
      * const entities = new Entities(sdk);
      *
-     * // Get all entities
-     * const allEntities = await entities.getAll();
+     * // Tenant-only (default)
+     * const tenantEntities = await entities.getAll();
+     *
+     * // A single folder's entities (preferred when targeting a specific folder)
+     * const folderEntities = await entities.getAll({ folderKey: "<folderKey>" });
+     *
+     * // Tenant + folder entities together
+     * const allEntities = await entities.getAll({ includeFolderEntities: true });
      *
      * // Call operations on an entity
-     * const records = await allEntities[0].getAllRecords();
+     * const records = await tenantEntities[0].getAllRecords();
      * ```
      */
-    async getAll() {
-        const response = await this.get(DATA_FABRIC_ENDPOINTS.ENTITY.GET_ALL);
+    async getAll(options) {
+        // folderKey is preferred over includeFolderEntities: when present, scope to that folder
+        // via the v1 endpoint + header. Only when no folderKey is given AND includeFolderEntities
+        // is explicitly true does the SDK switch to the v2 endpoint (returns tenant + folder
+        // entities together). Default (no options or includeFolderEntities omitted) stays on
+        // the v1 endpoint = tenant only.
+        const endpoint = !options?.folderKey && options?.includeFolderEntities
+            ? DATA_FABRIC_ENDPOINTS.ENTITY.GET_ALL_V2
+            : DATA_FABRIC_ENDPOINTS.ENTITY.GET_ALL;
+        const response = await this.get(endpoint, { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
         // Apply transformations
         const entities = response.data.map(entity => {
             // Transform each entity
@@ -2579,7 +2651,7 @@ class EntityService extends BaseService {
      * Queries entity records with filters, sorting, aggregates, and pagination
      *
      * @param id - UUID of the entity
-     * @param options - Query options including filterGroup, selectedFields, sortOptions, aggregates, groupBy, and pagination
+     * @param options - Query options including filterGroup, selectedFields, sortOptions, aggregates, groupBy, and pagination The `folderKey` property is **experimental**.
      * @returns Promise resolving to {@link NonPaginatedResponse} without pagination options,
      *   or {@link PaginatedResponse} when `pageSize`, `cursor`, or `jumpToPage` are provided
      *
@@ -2626,18 +2698,24 @@ class EntityService extends BaseService {
      *     { function: EntityAggregateFunction.Avg, field: "amount", alias: "avgAmount" },
      *   ],
      * });
+     *
+     * // Folder-scoped entity: pass the entity's folder key
+     * await entities.queryRecordsById("<entityId>", {
+     *   filterGroup: { queryFilters: [{ fieldName: "status", operator: QueryFilterOperator.Equals, value: "active" }] },
+     *   folderKey: "<folderKey>",
+     * });
      * ```
      */
     async queryRecordsById(id, options) {
-        // folderKey is header-only — destructure it out so PaginationHelpers doesn't include
-        // it in the POST body alongside the query filters.
-        const { folderKey, ...rest } = options ?? {};
+        // folderKey is header-only; expansionLevel must be sent as a query param by PaginationHelpers.
+        const { folderKey, expansionLevel, ...rest } = options ?? {};
         const downstreamOptions = options === undefined ? undefined : rest;
         return PaginationHelpers.getAll({
             serviceAccess: this.createPaginationServiceAccess(),
             getEndpoint: () => DATA_FABRIC_ENDPOINTS.ENTITY.QUERY_BY_ID(id),
             method: HTTP_METHODS.POST,
             headers: createHeaders({ [FOLDER_KEY]: folderKey }),
+            queryParams: createParams({ expansionLevel }),
             pagination: {
                 paginationType: PaginationType.OFFSET,
                 itemsField: ENTITY_PAGINATION.ITEMS_FIELD,
@@ -2648,7 +2726,7 @@ class EntityService extends BaseService {
                     countParam: ENTITY_OFFSET_PARAMS.COUNT_PARAM
                 }
             },
-            excludeFromPrefix: ['expansionLevel', 'filterGroup', 'selectedFields', 'sortOptions', 'aggregates', 'groupBy']
+            excludeFromPrefix: ['filterGroup', 'selectedFields', 'sortOptions', 'aggregates', 'groupBy']
         }, downstreamOptions);
     }
     /**
@@ -2656,7 +2734,7 @@ class EntityService extends BaseService {
      *
      * @param id - UUID of the entity
      * @param file - CSV file to import (Blob, File, or Uint8Array)
-     * @param options - Optional {@link EntityImportRecordsByIdOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityImportRecordsByIdOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to import result with record counts
      *
      * @example
@@ -2699,7 +2777,7 @@ class EntityService extends BaseService {
      * @param entityId - UUID of the entity
      * @param recordId - UUID of the record containing the attachment
      * @param fieldName - Name of the File-type field containing the attachment
-     * @param options - Optional {@link EntityDownloadAttachmentOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityDownloadAttachmentOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to Blob containing the file content
      *
      * @example
@@ -2737,7 +2815,7 @@ class EntityService extends BaseService {
      * @param recordId - UUID of the record to upload the attachment to
      * @param fieldName - Name of the File-type field
      * @param file - File to upload (Blob, File, or Uint8Array)
-     * @param options - Optional {@link EntityUploadAttachmentOptions} (e.g. `expansionLevel`, `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityUploadAttachmentOptions} (e.g. `expansionLevel`, `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to {@link EntityUploadAttachmentResponse}
      *
      * @example
@@ -2782,7 +2860,7 @@ class EntityService extends BaseService {
      * @param entityId - UUID of the entity
      * @param recordId - UUID of the record containing the attachment
      * @param fieldName - Name of the File-type field containing the attachment
-     * @param options - Optional {@link EntityDeleteAttachmentOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityDeleteAttachmentOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving to {@link EntityDeleteAttachmentResponse}
      *
      * @example
@@ -2837,7 +2915,7 @@ class EntityService extends BaseService {
      * @param name - Entity name — must start with a letter and contain
      *   only letters, numbers, and underscores (e.g., `"productCatalog"`).
      * @param fields - Array of field definitions
-     * @param options - Optional entity-level settings ({@link EntityCreateOptions})
+     * @param options - Optional entity-level settings ({@link EntityCreateOptions}) The `folderKey` property is **experimental**.
      * @returns Promise resolving to the ID of the created entity
      *
      * @example
@@ -2853,17 +2931,36 @@ class EntityService extends BaseService {
      *   { fieldName: "price", type: EntityFieldDataType.DECIMAL, decimalPrecision: 4, maxValue: 999999, minValue: 0 },
      *   { fieldName: "quantity", type: EntityFieldDataType.INTEGER, maxValue: 10000, minValue: 1, defaultValue: "0" },
      * ]);
+     *
+     * // Cross-folder references — link a folder-scoped entity to entities and
+     * // system choice sets that live in another folder or at the tenant level.
+     * await entities.create("orderLine", [
+     *   {
+     *     fieldName: "order",
+     *     type: EntityFieldDataType.RELATIONSHIP,
+     *     referenceEntityId: "<orderEntityId>",
+     *     referenceFieldId: "<orderEntityPkId>",
+     *     referenceFolderKey: "<otherFolderKey>",     // target lives in a different folder
+     *   },
+     *   {
+     *     fieldName: "userType",
+     *     type: EntityFieldDataType.CHOICE_SET_SINGLE,
+     *     choiceSetId: "<systemUserTypeChoiceSetId>", // tenant-level system choice set
+     *     // referenceFolderKey omitted → SDK looks up the target at tenant scope
+     *   },
+     * ], { folderKey: "<sourceFolderKey>" });
      * ```
      * @internal
      */
     async create(name, fields, options) {
         const opts = options ?? {};
+        const fieldPayloads = await this.buildFieldsWithReferenceMeta(fields);
         const payload = {
             ...(opts.description !== undefined && { description: opts.description }),
             displayName: opts.displayName ?? name,
             entityDefinition: {
                 name,
-                fields: fields.map(f => this.buildSchemaFieldPayload(f)),
+                fields: fieldPayloads,
                 folderId: opts.folderKey ?? DATA_FABRIC_TENANT_FOLDER_ID,
                 isRbacEnabled: opts.isRbacEnabled ?? false,
                 isInsightsEnabled: opts.isAnalyticsEnabled ?? false,
@@ -2877,7 +2974,7 @@ class EntityService extends BaseService {
      * Deletes a Data Fabric entity and all its records
      *
      * @param id - UUID of the entity to delete
-     * @param options - Optional {@link EntityDeleteByIdOptions} (e.g. `folderKey` for folder-scoped entities)
+     * @param options - Optional {@link EntityDeleteByIdOptions} (e.g. `folderKey` for folder-scoped entities) The `folderKey` property is **experimental**.
      * @returns Promise resolving when the entity is deleted
      *
      * @example
@@ -2904,7 +3001,7 @@ class EntityService extends BaseService {
      * overwrite each other's changes.
      *
      * @param id - UUID of the entity to update
-     * @param options - Changes to apply ({@link EntityUpdateByIdOptions})
+     * @param options - Changes to apply ({@link EntityUpdateByIdOptions}) The `folderKey` property is **experimental**.
      * @returns Promise resolving when the update is complete
      *
      * @example
@@ -3016,10 +3113,9 @@ class EntityService extends BaseService {
                 };
             });
         }
-        // Build and append new fields
         const newFields = [];
         if (options.addFields?.length) {
-            newFields.push(...options.addFields.map(f => this.buildSchemaFieldPayload(f)));
+            newFields.push(...await this.buildFieldsWithReferenceMeta(options.addFields));
         }
         await this.post(DATA_FABRIC_ENDPOINTS.ENTITY.UPSERT, {
             displayName: raw.displayName,
@@ -3117,8 +3213,39 @@ class EntityService extends BaseService {
             return externalSource;
         });
     }
+    async buildFieldsWithReferenceMeta(fields) {
+        const metas = await Promise.all(fields.map(f => this.buildReferenceMeta(f)));
+        return fields.map((f, i) => this.buildSchemaFieldPayload(f, metas[i]));
+    }
+    // Choice-set targets resolve server-side by NAME (the API rejects cross-folder
+    // refs with empty target name even when folderId is supplied), so the SDK
+    // fetches the name once for each cross-folder choice-set field. Relationship
+    // targets resolve by folderId — no lookup needed.
+    async buildReferenceMeta(field) {
+        if (field.referenceFolderKey === undefined)
+            return undefined;
+        if (field.referenceEntityId === undefined && field.choiceSetId === undefined)
+            return undefined;
+        const folderId = field.referenceFolderKey;
+        const meta = {};
+        if (field.referenceEntityId !== undefined) {
+            meta.referenceEntity = { id: field.referenceEntityId, folderId };
+        }
+        if (field.choiceSetId !== undefined) {
+            const lookupFolderKey = folderId === DATA_FABRIC_TENANT_FOLDER_ID ? undefined : folderId;
+            const target = await this.get(DATA_FABRIC_ENDPOINTS.ENTITY.GET_BY_ID(field.choiceSetId), { headers: createHeaders({ [FOLDER_KEY]: lookupFolderKey }) });
+            meta.referenceChoiceSet = {
+                id: field.choiceSetId,
+                name: target.data.name,
+                folderId,
+                entityType: EntityType.ChoiceSet,
+                entityTypeId: ENTITY_TYPE_IDS[EntityType.ChoiceSet],
+            };
+        }
+        return meta;
+    }
     /** Converts a user-facing EntityCreateFieldOptions to the raw API field payload */
-    buildSchemaFieldPayload(field) {
+    buildSchemaFieldPayload(field, refMeta) {
         const fieldType = field.type ?? EntityFieldDataType.STRING;
         this.validateFieldConstraints(fieldType, field, field.fieldName);
         const isRelationship = fieldType === EntityFieldDataType.RELATIONSHIP;
@@ -3129,6 +3256,10 @@ class EntityService extends BaseService {
             });
         }
         const mapping = EntitySchemaFieldTypeMap[fieldType];
+        // Prefer the resolved {id, name, folderId} body so cross-folder targets resolve
+        // server-side; fall back to a bare {id} when no meta was fetched.
+        const referenceEntityBody = refMeta?.referenceEntity ?? (field.referenceEntityId === undefined ? undefined : { id: field.referenceEntityId });
+        const referenceChoiceSetBody = refMeta?.referenceChoiceSet;
         return {
             name: field.fieldName,
             displayName: field.displayName ?? field.fieldName,
@@ -3147,7 +3278,8 @@ class EntityService extends BaseService {
             ...(field.choiceSetId !== undefined && { choiceSetId: field.choiceSetId }),
             ...((isRelationship || isFile) && { isForeignKey: true }),
             ...(isRelationship && { referenceType: ReferenceType.ManyToOne }),
-            ...(field.referenceEntityId !== undefined && { referenceEntity: { id: field.referenceEntityId } }),
+            ...(referenceEntityBody !== undefined && { referenceEntity: referenceEntityBody }),
+            ...(referenceChoiceSetBody !== undefined && { referenceChoiceSet: referenceChoiceSetBody }),
             ...(field.referenceFieldId !== undefined && { referenceField: { id: field.referenceFieldId } }),
         };
     }
@@ -3310,8 +3442,14 @@ __decorate([
 
 class ChoiceSetService extends BaseService {
     /**
-     * Gets all choice sets in the system
+     * Gets choice sets in the tenant.
+     *
+     * Three call modes:
+     * - `getAll()` — default. Returns only tenant-level choice sets.
+     * - `getAll({ folderKey: "<uuid>" })` — preferred for folder-scoped data. Returns only choice sets in that folder.
+     * - `getAll({ includeFolderChoiceSets: true })` — returns tenant-level **and** folder-level choice sets together. `folderKey` is preferred over `includeFolderChoiceSets` when both are set.
      *
+     * @param options - Optional {@link ChoiceSetGetAllOptions} (`folderKey` to list a single folder's choice sets — preferred when scoping to a folder; `includeFolderChoiceSets: true` to list tenant + folder choice sets together) The `folderKey` property is **experimental**.
      * @returns Promise resolving to an array of choice set metadata
      *
      * @example
@@ -3320,18 +3458,33 @@ class ChoiceSetService extends BaseService {
      *
      * const choiceSets = new ChoiceSets(sdk);
      *
-     * // Get all choice sets
-     * const allChoiceSets = await choiceSets.getAll();
+     * // Tenant-only (default)
+     * const tenantChoiceSets = await choiceSets.getAll();
      *
-     * // Iterate through choice sets
-     * allChoiceSets.forEach(choiceSet => {
-     *   console.log(`ChoiceSet: ${choiceSet.displayName} (${choiceSet.name})`);
-     *   console.log(`Description: ${choiceSet.description}`);
-     * });
+     * // A single folder's choice sets (preferred when targeting a specific folder)
+     * const folderChoiceSets = await choiceSets.getAll({ folderKey: "<folderKey>" });
+     *
+     * // Tenant + folder choice sets together
+     * const allChoiceSets = await choiceSets.getAll({ includeFolderChoiceSets: true });
      * ```
      */
-    async getAll() {
-        const rawResponse = await this.get(DATA_FABRIC_ENDPOINTS.CHOICESETS.GET_ALL);
+    async getAll(options) {
+        return this.fetchAllChoiceSets(options);
+    }
+    /**
+     * Internal helper that performs the choice-set fetch. Kept separate from the
+     * public `getAll()` so that internal callers (e.g. `resolveChoiceSetName`)
+     * can reuse it without triggering double `@track` telemetry.
+     */
+    async fetchAllChoiceSets(options) {
+        // The choice-set endpoint returns cross-scope results when called without
+        // a folder header. To stay tenant-only by default, send the tenant-marker
+        // UUID as the folder key unless the caller explicitly opts into cross-scope
+        // via includeFolderChoiceSets: true. folderKey is preferred over
+        // includeFolderChoiceSets when both are set.
+        const folderKey = options?.folderKey
+            ?? (options?.includeFolderChoiceSets ? undefined : DATA_FABRIC_TENANT_FOLDER_ID);
+        const rawResponse = await this.get(DATA_FABRIC_ENDPOINTS.CHOICESETS.GET_ALL, { headers: createHeaders({ [FOLDER_KEY]: folderKey }) });
         // Transform field names
         const data = rawResponse.data || [];
         return data.map(choiceSet => transformData(choiceSet, EntityMap));
@@ -3344,7 +3497,7 @@ class ChoiceSetService extends BaseService {
      * - A PaginatedResponse with navigation cursors (when any pagination parameter is provided)
      *
      * @param choiceSetId - UUID of the choice set
-     * @param options - Pagination options
+     * @param options - Pagination options and optional `folderKey` for folder-scoped choice sets The `folderKey` property is **experimental**.
      * @returns Promise resolving to choice set values or paginated result
      *
      * @example
@@ -3373,6 +3526,9 @@ class ChoiceSetService extends BaseService {
      * if (page1.hasNextPage) {
      *   const page2 = await choiceSets.getById(choiceSetId, { cursor: page1.nextCursor });
      * }
+     *
+     * // Folder-scoped choice set
+     * const folderValues = await choiceSets.getById(choiceSetId, { folderKey: "<folderKey>" });
      * ```
      */
     async getById(choiceSetId, options) {
@@ -3381,11 +3537,16 @@ class ChoiceSetService extends BaseService {
             const camelCased = pascalToCamelCaseKeys(item);
             return transformData(camelCased, EntityMap);
         };
+        // folderKey is header-only — destructure it out so PaginationHelpers doesn't
+        // include it in the POST body alongside pagination params.
+        const { folderKey, ...rest } = options ?? {};
+        const downstreamOptions = options === undefined ? undefined : rest;
         return PaginationHelpers.getAll({
             serviceAccess: this.createPaginationServiceAccess(),
             getEndpoint: () => DATA_FABRIC_ENDPOINTS.CHOICESETS.GET_BY_ID(choiceSetId),
             transformFn,
             method: HTTP_METHODS.POST,
+            headers: createHeaders({ [FOLDER_KEY]: folderKey }),
             pagination: {
                 paginationType: PaginationType.OFFSET,
                 itemsField: CHOICESET_VALUES_PAGINATION.ITEMS_FIELD,
@@ -3396,7 +3557,7 @@ class ChoiceSetService extends BaseService {
                     countParam: ENTITY_OFFSET_PARAMS.COUNT_PARAM
                 }
             }
-        }, options);
+        }, downstreamOptions);
     }
     /**
      * Creates a new Data Fabric choice set
@@ -3404,7 +3565,7 @@ class ChoiceSetService extends BaseService {
      * @param name - Choice set name. Must start with a
      *   letter, may contain only letters, numbers, and underscores, length
      *   3–100 characters (e.g., `"expenseTypes"`).
-     * @param options - Optional choice-set-level settings ({@link ChoiceSetCreateOptions})
+     * @param options - Optional choice-set-level settings ({@link ChoiceSetCreateOptions}) The `folderKey` property is **experimental**.
      * @returns Promise resolving to the UUID of the created choice set
      *
      * @example
@@ -3435,7 +3596,7 @@ class ChoiceSetService extends BaseService {
                 folderId: opts.folderKey ?? DATA_FABRIC_TENANT_FOLDER_ID,
             },
         };
-        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.CREATE, payload);
+        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.CREATE, payload, { headers: createHeaders({ [FOLDER_KEY]: opts.folderKey }) });
         return response.data;
     }
     /**
@@ -3445,7 +3606,7 @@ class ChoiceSetService extends BaseService {
      * the call throws `ValidationError` if both are omitted.
      *
      * @param choiceSetId - UUID of the choice set to update
-     * @param options - Metadata fields to change ({@link ChoiceSetUpdateOptions})
+     * @param options - Metadata fields to change ({@link ChoiceSetUpdateOptions}) The `folderKey` property is **experimental**.
      * @returns Promise resolving when the update is complete
      *
      * @example
@@ -3470,12 +3631,13 @@ class ChoiceSetService extends BaseService {
         await this.patch(DATA_FABRIC_ENDPOINTS.CHOICESETS.UPDATE(choiceSetId), {
             ...(options.displayName !== undefined && { displayName: options.displayName }),
             ...(options.description !== undefined && { description: options.description }),
-        });
+        }, { headers: createHeaders({ [FOLDER_KEY]: options.folderKey }) });
     }
     /**
      * Deletes a Data Fabric choice set and all its values.
      *
      * @param choiceSetId - UUID of the choice set to delete
+     * @param options - Optional {@link ChoiceSetDeleteByIdOptions} (e.g. `folderKey` for folder-scoped choice sets) The `folderKey` property is **experimental**.
      * @returns Promise resolving when the choice set is deleted
      *
      * @example
@@ -3485,18 +3647,21 @@ class ChoiceSetService extends BaseService {
      * const expenseTypes = allChoiceSets.find(cs => cs.name === 'expense_types');
      *
      * await choicesets.deleteById(expenseTypes.id);
+     *
+     * // Folder-scoped choice set
+     * await choicesets.deleteById(expenseTypes.id, { folderKey: "<folderKey>" });
      * ```
      * @internal
      */
-    async deleteById(choiceSetId) {
-        await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.DELETE(choiceSetId), {});
+    async deleteById(choiceSetId, options) {
+        await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.DELETE(choiceSetId), {}, { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
     }
     /**
      * Inserts a single value into a choice set.
      *
      * @param choiceSetId - UUID of the parent choice set
      * @param name - Identifier name of the new value (e.g., `"TRAVEL"`)
-     * @param options - Optional fields ({@link ChoiceSetValueInsertOptions})
+     * @param options - Optional fields ({@link ChoiceSetValueInsertOptions}) The `folderKey` property is **experimental**.
      * @returns Promise resolving to the inserted value ({@link ChoiceSetValueInsertResponse})
      *
      * @example
@@ -3509,16 +3674,22 @@ class ChoiceSetService extends BaseService {
      *   displayName: 'Travel',
      * });
      * console.log(inserted.id);
+     *
+     * // Folder-scoped choice set: folderKey is required on the wire
+     * await choicesets.insertValueById(expenseTypes.id, 'TRAVEL', {
+     *   displayName: 'Travel',
+     *   folderKey: "<folderKey>",
+     * });
      * ```
      * @internal
      */
     async insertValueById(choiceSetId, name, options) {
-        const choiceSetName = await this.resolveChoiceSetName(choiceSetId);
+        const choiceSetName = await this.resolveChoiceSetName(choiceSetId, options?.folderKey);
         const payload = {
             Name: name,
             ...(options?.displayName !== undefined && { DisplayName: options.displayName }),
         };
-        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.INSERT_BY_NAME(choiceSetName), payload);
+        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.INSERT_BY_NAME(choiceSetName), payload, { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
         const camelCased = pascalToCamelCaseKeys(response.data);
         return transformData(camelCased, EntityMap);
     }
@@ -3531,6 +3702,7 @@ class ChoiceSetService extends BaseService {
      * @param choiceSetId - UUID of the parent choice set
      * @param valueId - UUID of the value to update
      * @param displayName - New human-readable display name for the value
+     * @param options - Optional {@link ChoiceSetValueUpdateOptions} — pass `folderKey` for folder-scoped choice sets; omit for tenant-level. The `folderKey` property is **experimental**.
      * @returns Promise resolving to the updated value ({@link ChoiceSetValueUpdateResponse})
      *
      * @example
@@ -3542,13 +3714,18 @@ class ChoiceSetService extends BaseService {
      * const travel = values.items.find(v => v.name === 'TRAVEL');
      *
      * await choicesets.updateValueById(expenseTypes.id, travel.id, 'Business Travel');
+     *
+     * // Folder-scoped choice set: folderKey is required on the wire
+     * await choicesets.updateValueById(expenseTypes.id, travel.id, 'Business Travel', {
+     *   folderKey: "<folderKey>",
+     * });
      * ```
      * @internal
      */
-    async updateValueById(choiceSetId, valueId, displayName) {
-        const choiceSetName = await this.resolveChoiceSetName(choiceSetId);
+    async updateValueById(choiceSetId, valueId, displayName, options) {
+        const choiceSetName = await this.resolveChoiceSetName(choiceSetId, options?.folderKey);
         const payload = { DisplayName: displayName };
-        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.UPDATE_BY_NAME(choiceSetName, valueId), payload);
+        const response = await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.UPDATE_BY_NAME(choiceSetName, valueId), payload, { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
         const camelCased = pascalToCamelCaseKeys(response.data);
         return transformData(camelCased, EntityMap);
     }
@@ -3557,6 +3734,7 @@ class ChoiceSetService extends BaseService {
      *
      * @param choiceSetId - UUID of the parent choice set
      * @param valueIds - Array of value UUIDs to delete
+     * @param options - Optional {@link ChoiceSetValueDeleteOptions} (e.g. `folderKey` for folder-scoped choice sets) The `folderKey` property is **experimental**.
      * @returns Promise resolving when the values are deleted
      *
      * @example
@@ -3566,14 +3744,20 @@ class ChoiceSetService extends BaseService {
      * const idsToDelete = values.items.slice(0, 2).map(v => v.id);
      *
      * await choicesets.deleteValuesById('<choiceSetId>', idsToDelete);
+     *
+     * // Folder-scoped choice set
+     * await choicesets.deleteValuesById('<choiceSetId>', idsToDelete, { folderKey: "<folderKey>" });
      * ```
      * @internal
      */
-    async deleteValuesById(choiceSetId, valueIds) {
-        await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.DELETE_BY_ID(choiceSetId), valueIds);
+    async deleteValuesById(choiceSetId, valueIds, options) {
+        await this.post(DATA_FABRIC_ENDPOINTS.CHOICESETS.DELETE_BY_ID(choiceSetId), valueIds, { headers: createHeaders({ [FOLDER_KEY]: options?.folderKey }) });
     }
-    async resolveChoiceSetName(choiceSetId) {
-        const all = await this.getAll();
+    async resolveChoiceSetName(choiceSetId, folderKey) {
+        // Use the un-tracked helper directly so we don't fire a duplicate
+        // `Choicesets.GetAll` telemetry event for every insertValueById /
+        // updateValueById call.
+        const all = await this.fetchAllChoiceSets(folderKey === undefined ? undefined : { folderKey });
         const match = all.find(cs => cs.id === choiceSetId);
         if (!match) {
             throw new NotFoundError({ message: `Choice set with id '${choiceSetId}' not found.` });