From f2c8149b4e8365ca5d794d103221e47c015026c6 Mon Sep 17 00:00:00 2001
From: Xavier Krantz <xakraz@gmail.com>
Date: Tue, 10 Jun 2025 15:22:17 +0200
Subject: [PATCH] fix: fix the `load-parser-config.js` returned config

---
 lib/load-parser-config.js | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/lib/load-parser-config.js b/lib/load-parser-config.js
index a6863e71..37fa134c 100644
--- a/lib/load-parser-config.js
+++ b/lib/load-parser-config.js
@@ -3,6 +3,11 @@ import { fileURLToPath } from "node:url";
 import importFrom from "import-from-esm";
 import conventionalChangelogAngular from "conventional-changelog-angular";
 
+import debugFactory from "debug";
+const debug = debugFactory(
+  "semantic-release:commit-analyser:lib:load-parser-config"
+);
+
 /**
  * Load `conventional-changelog-parser` options. Handle presets that return either a `Promise<Array>` or a `Promise<Function>`.
  *
@@ -15,20 +20,46 @@ import conventionalChangelogAngular from "conventional-changelog-angular";
  *
  * @return {Promise<Object>} a `Promise` that resolve to the `conventional-changelog-parser` options.
  */
-export default async ({ preset, config, parserOpts, presetConfig }, { cwd }) => {
+export default async (
+  { preset, config, parserOpts, presetConfig },
+  { cwd }
+) => {
   let loadedConfig;
   const __dirname = dirname(fileURLToPath(import.meta.url));
 
   if (preset) {
+    debug("Loading preset: %s", preset);
+
     const presetPackage = `conventional-changelog-${preset.toLowerCase()}`;
+    debug("Using preset package: %s", presetPackage);
+
     loadedConfig = await (
-      (await importFrom.silent(__dirname, presetPackage)) || (await importFrom(cwd, presetPackage))
+      (await importFrom.silent(__dirname, presetPackage)) ||
+      (await importFrom(cwd, presetPackage))
     )(presetConfig);
   } else if (config) {
-    loadedConfig = await ((await importFrom.silent(__dirname, config)) || (await importFrom(cwd, config)))();
+    debug("No preset defined, loading config instead: %s", config);
+    loadedConfig = await (
+      (await importFrom.silent(__dirname, config)) ||
+      (await importFrom(cwd, config))
+    )();
   } else {
+    debug(
+      "No preset or config provided, using conventional-changelog-angular as default"
+    );
     loadedConfig = await conventionalChangelogAngular();
   }
 
-  return { ...loadedConfig.parser, ...parserOpts };
+  debug("Loaded parser config: ", JSON.stringify(loadedConfig, null, 2));
+  debug("Applying parser options: ", parserOpts);
+
+  // Most modern conventional changelog presets (including conventionalcommits) export parserOpts.
+  // Some older ones (like conventional-changelog-angular) export parser.
+  const mergedConfig = {
+    ...(loadedConfig.parserOpts || loadedConfig.parser),
+    ...parserOpts,
+  };
+  debug("Merged parser config: ", JSON.stringify(mergedConfig, null, 2));
+  // Merge the loaded parser config with the provided parserOpts
+  return mergedConfig;
 };