fixup!

Author: avivkeller

src/utils/configuration/__tests__/index.test.mjs

@@ -137,6 +137,8 @@ describe('config.mjs', () => {
         threads: 2,
       });
 
+      console.log(config);
+
       assert.strictEqual(config.global.input, 'custom-src/');
       assert.strictEqual(config.global.output, 'custom-dist/');
       assert.strictEqual(config.threads, 2);
@@ -220,34 +222,6 @@ describe('config.mjs', () => {
     });
   });
 
-  describe('merge behavior', () => {
-    it('should handle array concatenation', async () => {
-      mockImportFromURL.mock.mockImplementationOnce(async () =>
-        createMockConfig({ global: { ignore: ['node_modules/'] } })
-      );
-
-      const config = await createRunConfiguration({
-        configFile: 'config.mjs',
-        ignore: ['dist/'],
-      });
-
-      assert.ok(Array.isArray(config.global.ignore));
-    });
-
-    it('should prefer earlier non-array values', async () => {
-      mockImportFromURL.mock.mockImplementationOnce(async () =>
-        createMockConfig({ global: { minify: false } })
-      );
-
-      const config = await createRunConfiguration({
-        configFile: 'config.mjs',
-        minify: true,
-      });
-
-      assert.strictEqual(config.global.minify, false);
-    });
-  });
-
   describe('transformation optimization', () => {
     const testCases = [
       {

src/utils/misc.mjs

@@ -29,20 +29,20 @@ export const deepMerge = (...objects) => {
   const base = objects.pop();
 
   return objects.reduce((result, source) => {
-    // Skip null/undefined values
-    if (!source) {
-      return result;
-    }
-
     for (const key in source) {
       if (Object.prototype.hasOwnProperty.call(source, key)) {
         const sourceValue = source[key];
+        const isSourcePlainObject = isPlainObject(sourceValue);
+
         const targetValue = result[key];
+        const baseValue = base[key];
 
         result[key] =
-          isPlainObject(targetValue) && isPlainObject(sourceValue)
-            ? deepMerge(targetValue, sourceValue, base[key])
-            : sourceValue;
+          isSourcePlainObject && isPlainObject(targetValue)
+            ? deepMerge(targetValue, sourceValue, baseValue ?? {})
+            : isSourcePlainObject && isPlainObject(baseValue)
+              ? deepMerge(sourceValue, baseValue)
+              : (sourceValue ?? baseValue);
       }
     }