fixes

Author: paula-stacho

packages/compass-data-modeling/src/utils/schema-traversal.spec.tsx

@@ -1187,11 +1187,13 @@ describe('getSchemaForNewTypes', function () {
         const result = getSchemaForNewTypes(oldSchema, newTypes);
         expect(result).not.to.have.property('bsonType');
         expect(result.anyOf).to.have.lengthOf(3);
-        expect(result.anyOf).to.deep.include(oldSchema.anyOf[0]);
-        expect(result.anyOf).to.deep.include(oldSchema.anyOf[1]);
-        expect(result.anyOf).to.deep.include({
-          bsonType: 'bool',
-        });
+        expect(result.anyOf).to.have.deep.members([
+          oldSchema.anyOf[0],
+          oldSchema.anyOf[1],
+          {
+            bsonType: 'bool',
+          },
+        ]);
       });
 
       it('adds object alongside a string', function () {
@@ -1228,6 +1230,46 @@ describe('getSchemaForNewTypes', function () {
           items: {},
         });
       });
+
+      it('adds string alongside an object', function () {
+        const newTypes = ['string', 'object'];
+        const oldSchema = {
+          bsonType: 'object',
+          properties: {
+            name: { bsonType: 'string' },
+          },
+          required: ['name'],
+        };
+        const result = getSchemaForNewTypes(oldSchema, newTypes);
+        expect(result).not.to.have.property('bsonType');
+        expect(result).not.to.have.property('properties');
+        expect(result).not.to.have.property('required');
+        expect(result.anyOf).to.have.lengthOf(2);
+        expect(result.anyOf).to.have.deep.members([
+          {
+            bsonType: 'string',
+          },
+          oldSchema,
+        ]);
+      });
+
+      it('adds string alongside an array', function () {
+        const newTypes = ['string', 'array'];
+        const oldSchema = {
+          bsonType: 'array',
+          items: { bsonType: 'int' },
+        };
+        const result = getSchemaForNewTypes(oldSchema, newTypes);
+        expect(result).not.to.have.property('bsonType');
+        expect(result).not.to.have.property('items');
+        expect(result.anyOf).to.have.lengthOf(2);
+        expect(result.anyOf).to.have.deep.members([
+          {
+            bsonType: 'string',
+          },
+          oldSchema,
+        ]);
+      });
     });
 
     describe('cleans up anyOf when it is no longer needed', function () {

packages/compass-data-modeling/src/utils/schema-traversal.tsx

@@ -220,11 +220,10 @@ const applySchemaUpdate = ({
         );
       return {
         ...schema,
-        properties: Object.fromEntries(
-          Object.entries(schema.properties).map(([key, value]) =>
-            key === fieldName ? [key, newFieldSchema] : [key, value]
-          )
-        ),
+        properties: {
+          ...schema.properties,
+          [fieldName]: newFieldSchema,
+        },
       };
     }
     default:
@@ -370,16 +369,10 @@ export function getSchemaForNewTypes(
 ): MongoDBJSONSchema {
   const oldTypes = getFieldTypes(oldSchema);
   if (oldTypes.join(',') === newTypes.join(',')) return oldSchema;
-  const newSchema: MongoDBJSONSchema = { ...oldSchema };
-  delete newSchema.anyOf;
 
   // Simple schema - new type does includes neither object nor array
   if (!newTypes.some((t) => t === 'object' || t === 'array')) {
-    newSchema.bsonType = newTypes;
-    delete newSchema.properties;
-    delete newSchema.items;
-    delete newSchema.required;
-    return newSchema;
+    return { bsonType: newTypes };
   }
 
   // Complex schema
@@ -398,8 +391,5 @@ export function getSchemaForNewTypes(
   if (newVariants.length === 1) {
     return newVariants[0];
   }
-  newSchema.anyOf = newVariants;
-  delete newSchema.bsonType;
-
-  return newSchema;
+  return { anyOf: newVariants };
 }