Consolidate and improve unflattenObject

src/platform/packages/shared/kbn-object-utils/src/unflatten_object.test.ts

@@ -51,4 +51,40 @@ describe('unflattenObject', () => {
       },
     });
   });
+
+  it('handles nested arrays', () => {
+    expect(
+      unflattenObject({
+        nested: [[{ 'first.second': 'foo' }, { 'first.second': 'bar' }]],
+        mixed: [[1, 2, { 'first.second': 'foo' }]],
+      })
+    ).toEqual({
+      nested: [[{ first: { second: 'foo' } }, { first: { second: 'bar' } }]],
+      mixed: [[1, 2, { first: { second: 'foo' } }]],
+    });
+  });
+
+  it('unflattens nested flattened objects', () => {
+    expect(
+      unflattenObject({
+        'my.flattened.parent.key': {
+          'an.internal.key': 1,
+        },
+      })
+    ).toEqual({
+      my: {
+        flattened: {
+          parent: {
+            key: {
+              an: {
+                internal: {
+                  key: 1,
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+  });
 });

src/platform/packages/shared/kbn-object-utils/src/unflatten_object.ts

@@ -18,13 +18,18 @@ export function unflattenObject<T extends Record<string, any>>(
   for (const key in source) {
     const val = source[key as keyof typeof source];
     if (Array.isArray(val)) {
-      const unflattenedArray = val.map((item: unknown) => {
-        if (item && typeof item === 'object' && !Array.isArray(item)) {
+      const unflattenedArray = val.map(function unflattenArray(item: unknown): unknown {
+        if (Array.isArray(item)) {
+          return item.map(unflattenArray);
+        }
+        if (item !== null && typeof item === 'object') {
           return unflattenObject(item);
         }
         return item;
       });
       set(target, key, unflattenedArray);
+    } else if (val !== null && typeof val === 'object') {
+      set(target, key, unflattenObject(val));
     } else {
       set(target, key, val);
     }

x-pack/solutions/observability/packages/utils-common/moon.yml

@@ -19,8 +19,6 @@ project:
     sourceRoot: x-pack/solutions/observability/packages/utils-common
 dependsOn:
   - '@kbn/es-query'
-  - '@kbn/safer-lodash-set'
-  - '@kbn/utility-types'
 tags:
   - shared-common
   - package

x-pack/solutions/observability/packages/utils-common/tsconfig.json

@@ -17,7 +17,5 @@
   ],
   "kbn_references": [
     "@kbn/es-query",
-    "@kbn/safer-lodash-set",
-    "@kbn/utility-types",
   ]
 }

x-pack/solutions/observability/plugins/observability_ai_assistant_app/moon.yml

@@ -93,6 +93,7 @@ dependsOn:
   - '@kbn/zod'
   - '@kbn/connector-schemas'
   - '@kbn/onechat-plugin'
+  - '@kbn/object-utils'
 tags:
   - plugin
   - prod

x-pack/solutions/observability/plugins/observability_ai_assistant_app/scripts/evaluation/read_kibana_config.ts

@@ -9,7 +9,7 @@ import path from 'path';
 import fs from 'fs';
 import yaml from 'js-yaml';
 import { identity, pickBy } from 'lodash';
-import { unflattenObject } from '@kbn/observability-utils-common/object/unflatten_object';
+import { unflattenObject } from '@kbn/object-utils';
 
 export type KibanaConfig = ReturnType<typeof readKibanaConfig>;
 

x-pack/solutions/observability/plugins/observability_ai_assistant_app/tsconfig.json

@@ -88,7 +88,8 @@
     "@kbn/utility-types-jest",
     "@kbn/zod",
     "@kbn/connector-schemas",
-    "@kbn/onechat-plugin"
+    "@kbn/onechat-plugin",
+    "@kbn/object-utils",
   ],
   "exclude": ["target/**/*"]
 }