chore: restore cli flag definitions

Author: GeeWizWow

bin/cli.js

@@ -35,6 +35,42 @@ const cli = meow(
 			const argvStart = process.argv.includes("--") ? process.argv.indexOf("--") + 1 : 2;
 			return process.argv.slice(argvStart);
 		},
+		booleanDefault: undefined,
+		flags: {
+			sequentialInit: {
+				type: "boolean",
+			},
+			sequentialPrepare: {
+				type: "boolean",
+			},
+			firstParent: {
+				type: "boolean",
+			},
+			debug: {
+				type: "boolean",
+			},
+			"deps.bump": {
+				type: "string",
+			},
+			"deps.release": {
+				type: "string",
+			},
+			"deps.prefix": {
+				type: "string",
+			},
+			ignorePrivate: {
+				type: "boolean",
+			},
+			ignorePackages: {
+				type: "string",
+			},
+			tagFormat: {
+				type: "string",
+			},
+			dryRun: {
+				type: "boolean",
+			},
+		},
 	}
 );
 

lib/getConfigMultiSemrel.js

@@ -1,6 +1,7 @@
 import { cosmiconfig } from "cosmiconfig";
 import { default as resolveFrom } from "resolve-from";
 import { pickBy, isNil, castArray } from "lodash-es";
+import { createRequire } from "module";
 
 const CONFIG_NAME = "multi-release";
 const CONFIG_FILES = [
@@ -15,6 +16,19 @@ const CONFIG_FILES = [
 	`${CONFIG_NAME}.config.cjs`,
 ];
 
+const mergeConfig = (a = {}, b = {}) => {
+	return {
+		...a,
+		// Remove `null` and `undefined` options so they can be replaced with default ones
+		...pickBy(b, (option) => !isNil(option)),
+		// Treat nested objects differently as otherwise we'll loose undefined keys
+		deps: {
+			...a.deps,
+			...pickBy(b.deps, (option) => !isNil(option)),
+		},
+	};
+};
+
 /**
  * Get the multi semantic release configuration options for a given directory.
  *
@@ -26,42 +40,41 @@ const CONFIG_FILES = [
  */
 export default async function getConfig(cwd, cliOptions) {
 	const { config } = (await cosmiconfig(CONFIG_NAME, { searchPlaces: CONFIG_FILES }).search(cwd)) || {};
-	const { extends: extendPaths, ...rest } = { ...config, ...cliOptions };
+	const { extends: extendPaths, ...rest } = { ...config };
 
 	let options = rest;
 
 	if (extendPaths) {
-		// If `extends` is defined, load and merge each shareable config with `options`
-		options = {
-			...castArray(extendPaths).reduce((result, extendPath) => {
-				const extendsOptions = require(resolveFrom.silent(__dirname, extendPath) ||
-					resolveFrom(cwd, extendPath));
-				return { ...result, ...extendsOptions };
-			}, {}),
-			...options,
-		};
+		const require = createRequire(import.meta.url);
+		// If `extends` is defined, load and merge each shareable config
+		const extendedOptions = castArray(extendPaths).reduce((result, extendPath) => {
+			const extendsOptions = require(resolveFrom(cwd, extendPath));
+			return mergeConfig(result, extendsOptions);
+		}, {});
+
+		options = mergeConfig(options, extendedOptions);
 	}
 
 	// Set default options values if not defined yet
-	options = {
-		sequentialInit: false,
-		sequentialPrepare: true,
-		firstParent: false,
-		debug: false,
-		ignorePrivate: true,
-		ignorePackages: "",
-		tagFormat: "${name}@${version}",
-		dryRun: false,
-		// Remove `null` and `undefined` options so they can be replaced with default ones
-		...pickBy(options, (option) => !isNil(option)),
-		// Treat nested objects differently as otherwise we'll loose undefined keys
-		deps: {
-			bump: "override",
-			release: "patch",
-			prefix: "",
-			...pickBy(options.deps, (option) => !isNil(option)),
+	options = mergeConfig(
+		{
+			sequentialInit: false,
+			sequentialPrepare: true,
+			firstParent: false,
+			debug: false,
+			ignorePrivate: true,
+			ignorePackages: "",
+			tagFormat: "${name}@${version}",
+			dryRun: false,
+			deps: {
+				bump: "override",
+				release: "patch",
+				prefix: "",
+			},
 		},
-	};
+		options
+	);
 
-	return options;
+	// Finally merge CLI options last so they always win
+	return mergeConfig(options, cliOptions);
 }