@acorex/cdk 20.2.0-next.15 → 20.2.0-next.16

package/common/index.d.ts

@@ -653,7 +653,7 @@ declare function convertArrayToDataSource<T = unknown>(items: T[], options?: {
     key: string;
     pageSize: number;
 }): AXDataSource<T>;
-declare function applyDataSourceQuery<T extends Record<string, any>>(items: T[], filter: AXDataSourceFilterOption): T[];
+declare function applyDataSourceQuery<T extends Record<string, unknown>>(items: T[], filter: AXDataSourceFilterOption): T[];
 
 interface AXDataListQuery {
     take?: number;

package/fesm2022/acorex-cdk-common.mjs

@@ -1173,18 +1173,34 @@ class AXDataSource {
     }
 }
 function convertArrayToDataSource(items, options = { key: 'id', pageSize: 100 }) {
+    // Normalize primitives to objects so consumers (e.g., select/list) can rely on
+    // value and text fields without triggering extra byKey lookups.
+    const normalizedItems = items.map((candidate) => {
+        const isObjectItem = candidate != null && typeof candidate === 'object';
+        if (isObjectItem) {
+            return candidate;
+        }
+        // For primitive values, create an object with both key and text
+        return { [options.key]: candidate, text: String(candidate ?? '') };
+    });
     const config = {
         key: options.key,
         pageSize: options.pageSize,
         load: async (e) => {
-            const result = e.filter ? applyDataSourceQuery(items, e.filter) : items;
+            const itemsForFilter = normalizedItems;
+            const resultNormalized = e.filter
+                ? applyDataSourceQuery(itemsForFilter, e.filter)
+                : itemsForFilter;
+            const result = resultNormalized;
             return {
                 items: result.slice(e.skip, e.skip + e.take),
-                total: result.length,
+                total: resultNormalized.length,
             };
         },
-        byKey: async (v) => items.find((c) => {
-            return c[options.key] == v;
+        byKey: async (v) => 
+        // Search in the normalized list (supports primitive and object arrays)
+        normalizedItems.find((record) => {
+            return record[options.key] == v;
         }),
     };
     return new AXDataSource(config);