@halospv3/hce.shared-config 3.5.3-develop.1 → 3.6.0-develop.1

package/mjs/dotnet/NugetRegistryInfo.mjs

@@ -14,7 +14,7 @@ import { config } from "@dotenvx/dotenvx";
 import { detectFile, detectFileSync } from "chardet";
 import sanitizeFileName from "sanitize-filename";
 //#region src/dotnet/NugetRegistryInfo.ts
-const tmpDirNamespace = node_path.join(tmpdir(), "HCE.Shared", ".NET", "Dummies");
+const temporaryDirectoryNamespace = node_path.join(tmpdir(), "HCE.Shared", ".NET", "Dummies");
 const defaultNugetSource = "https://api.nuget.org/v3/index.json";
 const key_OutputPackItems = "_OutputPackItems";
 /**
@@ -29,14 +29,14 @@ async function getGithubOutput() {
 		env["GITHUB_OUTPUT"] = githubOutputPath;
 	}
 	const encoding = await detectFile(env["GITHUB_OUTPUT"]);
-	const envOutput = config({
+	const environmentOutput = config({
 		path: env["GITHUB_OUTPUT"],
 		override: true,
 		encoding: encoding ?? void 0,
 		processEnv: {}
 	});
-	if (isError(envOutput.error)) throw envOutput.error;
-	return envOutput.parsed;
+	if (isError(environmentOutput.error)) throw environmentOutput.error;
+	return environmentOutput.parsed;
 }
 /**
 * Read the contents of $GITHUB_OUTPUT (if its value is a file path) or $TEMP/GITHUB_OUTPUT.
@@ -50,14 +50,14 @@ function getGithubOutputSync() {
 		env["GITHUB_OUTPUT"] = githubOutputPath;
 	}
 	const encoding = detectFileSync(env["GITHUB_OUTPUT"]);
-	const envOutput = config({
+	const environmentOutput = config({
 		path: env["GITHUB_OUTPUT"],
 		override: true,
 		encoding: encoding ?? void 0,
 		processEnv: {}
 	});
-	if ("error" in envOutput) throw envOutput.error;
-	return envOutput.parsed;
+	if ("error" in environmentOutput) throw environmentOutput.error;
+	return environmentOutput.parsed;
 }
 /**
 * Get HCE.Shared's temporary directory for .NET projects' dummy packages.
@@ -67,32 +67,45 @@ function getGithubOutputSync() {
 * `${tmpdir()}/HCE.Shared/.NET/Dummies/${project.Properties.PackageId}` if
 * {@link project} is defined. Else `${tmpdir()}/HCE.Shared/.NET/Dummies`
 */
-function getDummiesDir(project) {
+function getDummiesDirectory(project) {
 	switch (true) {
-		case project === void 0: return node_path.join(tmpDirNamespace, node_path.sep);
-		case project instanceof MSBuildProject: return node_path.join(tmpDirNamespace, project.Properties.PackageId, node_path.sep);
+		case project === void 0: return node_path.join(temporaryDirectoryNamespace, node_path.sep);
+		case project instanceof MSBuildProject: return node_path.join(temporaryDirectoryNamespace, project.Properties.PackageId, node_path.sep);
 		default: throw new Error("The type of argument `project` must be `undefined` or `MSBuildProject`.");
 	}
 }
 /**
 * Get the environment variables as key-value pairs.
-* @param tokenEnvVars The name of the environment variables whose values are
+* @param tokenEnvironmentVariables The name of the environment variables whose values are
 * NuGet API keys.
 * @returns an array of key-value pairs of the given environment variables and
 * their values, filtered to only those whose values are not undefined.
 * @throws {Error} when none of the provided environment variables are defined.
 */
-function _GetTokenEnvVariables(tokenEnvVars) {
-	const definedTokens = Object.freeze(tokenEnvVars.map((key) => [key, getEnvVarValue(key)]).filter((envVarTuple) => envVarTuple[1] !== void 0));
+function _GetTokenEnvironmentVariables(tokenEnvironmentVariables) {
+	const definedTokens = Object.freeze(tokenEnvironmentVariables.map((key) => [key, getEnvVarValue(key)]).filter((environmentVariableTuple) => environmentVariableTuple[1] !== void 0));
 	if (definedTokens.length > 0) return definedTokens;
 }
 var NugetRegistryInfo = class NugetRegistryInfo {
-	_canPushPackagesToSource = void 0;
-	_project;
-	_resolvedEnvVariable;
-	_source;
 	static DefaultTokenEnvVars = Object.freeze(["NUGET_TOKEN"]);
 	/**
+	* Get the API token from {@link NugetRegistryInfo#resolvedEnvVariable}
+	* @param resolvedEnvironmentVariable The name of the environment variable(s) whose
+	* value is a NuGet API key. Typically, the value of
+	* {@link NugetRegistryInfo#resolvedEnvVariable}.
+	* @returns The value of the first defined environment variable.
+	* @throws {Error} when none of the provided environment variables are defined.
+	*/
+	static _GetTokenValue(resolvedEnvironmentVariable) {
+		type.string.assert(resolvedEnvironmentVariable);
+		const tokenValue = getEnvVarValue(resolvedEnvironmentVariable);
+		if (tokenValue === void 0) throw new Error(`\
+The environment variable ${resolvedEnvironmentVariable} was specified \
+as the source of the token to push a NuGet package, \
+but the environment variable is empty or undefined.`);
+		return tokenValue;
+	}
+	/**
 	* Convert a URL string to a filesystem folder name.
 	*
 	* Intended usage: modify the output path of `dotnet pack` based on the NuGet
@@ -109,6 +122,10 @@ var NugetRegistryInfo = class NugetRegistryInfo {
 	static GetDirNameForSource(source) {
 		return sanitizeFileName(source.replaceAll(/\/index.json$/g, ""), { replacement: "_" });
 	}
+	_canPushPackagesToSource = void 0;
+	_project;
+	_resolvedEnvVariable;
+	_source;
 	/**
 	* Creates an instance of NugetRegistryInfo.\
 	* This class enables the ability to push a given {@link project}'s
@@ -125,29 +142,29 @@ var NugetRegistryInfo = class NugetRegistryInfo {
 	*   Release's config object for later use by `@semantic-release/exec`.
 	* - Other EcmaScript modules can access the environment variable(s) and steal
 	*   your key. Be aware of malicious dependencies!
-	* @param opts The input type of {@link NRIOpts.from}
-	* @param opts.project The project whose package(s) will be
+	* @param options The input type of {@link NRIOpts.from}
+	* @param options.project The project whose package(s) will be
 	* pushed.\
 	* - Its {@link NugetProjectProperties#PackageId} will be read.\
 	* - Its {@link NugetProjectProperties#PackageVersion} will be overridden via CLI args when creating a dummy package. The real package's
 	* `PackageVersion` will *not* be overridden.
-	* @param [opts.tokenEnvVars] The environment variables
+	* @param [options.tokenEnvVars] The environment variables
 	* whose values are tokens with permission to push a package to the NuGet
 	* package registry. The array is iterated through until one token is found.
 	* If none of the environment variables are defined, this constructor will
 	* throw an {@link Error}.
-	* @param [opts.source] A NuGet package registry's API endpoint URL or name. Default: 'https://api.nuget.org/v3/index.json'
+	* @param [options.source] A NuGet package registry's API endpoint URL or name. Default: 'https://api.nuget.org/v3/index.json'
 	*/
-	constructor(opts) {
-		const validOpts = NRIOpts.from(opts);
-		this._project = validOpts.project;
+	constructor(options) {
+		const validOptions = NRIOpts.from(options);
+		this._project = validOptions.project;
 		/**
 		* May throw! Assign key of the first key-value pair to
 		* {@link resolvedEnvVariable}
 		*/
-		const tokenVars = _GetTokenEnvVariables(validOpts.tokenEnvVars);
-		if (tokenVars) this._resolvedEnvVariable = tokenVars[0][0];
-		this._source = validOpts.source;
+		const tokenVariables = _GetTokenEnvironmentVariables(validOptions.tokenEnvVars);
+		if (tokenVariables) this._resolvedEnvVariable = tokenVariables[0][0];
+		this._source = validOptions.source;
 	}
 	get project() {
 		return this._project;
@@ -170,9 +187,9 @@ var NugetRegistryInfo = class NugetRegistryInfo {
 		let tokenValue;
 		if (this.resolvedEnvVariable !== void 0) tokenValue = NRI._GetTokenValue(this.resolvedEnvVariable);
 		if (tokenValue?.startsWith("github_pat_")) {
-			const errMsg = `The value of the token in 'resolvedEnvVariable' ${String(this.resolvedEnvVariable)} begins with 'github_pat_', indicating it's a Fine-Grained token. At the time of writing, GitHub Fine-Grained tokens cannot push packages. If you believe this is statement is outdated, report the issue at https://github.com/halospv3/hce.shared/issues/new. For more information, see https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.`;
-			const err = new Error(errMsg);
-			return this._canPushPackagesToSource = Promise.reject(err);
+			const errorMessage = `The value of the token in 'resolvedEnvVariable' ${String(this.resolvedEnvVariable)} begins with 'github_pat_', indicating it's a Fine-Grained token. At the time of writing, GitHub Fine-Grained tokens cannot push packages. If you believe this is statement is outdated, report the issue at https://github.com/halospv3/hce.shared/issues/new. For more information, see https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.`;
+			const error = new Error(errorMessage);
+			return this._canPushPackagesToSource = Promise.reject(error);
 		}
 		return this._canPushPackagesToSource = this.PackDummyPackage({}).then(async () => await this._PushDummyPackages({ apiKey: tokenValue })).then((execAsyncReturn) => {
 			ok(execAsyncReturn);
@@ -191,23 +208,6 @@ var NugetRegistryInfo = class NugetRegistryInfo {
 		return this._source;
 	}
 	/**
-	* Get the API token from {@link NugetRegistryInfo#resolvedEnvVariable}
-	* @param resolvedEnvVariable The name of the environment variable(s) whose
-	* value is a NuGet API key. Typically, the value of
-	* {@link NugetRegistryInfo#resolvedEnvVariable}.
-	* @returns The value of the first defined environment variable.
-	* @throws {Error} when none of the provided environment variables are defined.
-	*/
-	static _GetTokenValue(resolvedEnvVariable) {
-		type.string.assert(resolvedEnvVariable);
-		const tokenValue = getEnvVarValue(resolvedEnvVariable);
-		if (tokenValue === void 0) throw new Error(`\
-The environment variable ${resolvedEnvVariable} was specified \
-as the source of the token to push a NuGet package, \
-but the environment variable is empty or undefined.`);
-		return tokenValue;
-	}
-	/**
 	* The type for options and arguments of `dotnet pack`. See https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-pack.
 	*
 	* {@link NRI.PackPackagesOptionsType.t.propertyOverrides `propertyOverrides`}
@@ -248,58 +248,58 @@ but the environment variable is empty or undefined.`);
 	* When pushing the package(s), you only need to supply the main .nupkg's path
 	* or its directory to the dotnet CLI—by default, it will also push the
 	* symbols package, if present.
-	* @param opts Options passed to
+	* @param options Options passed to
 	* `dotnet pack`, excluding the required `<PROJECT | SOLUTION>` argument. The
 	* {@link PackPackagesOptionsType.t.output} path is modified according to the
-	* {@link usePerSourceSubfolder} and {@link usePerPackageIdSubfolder}
+	* {@link shouldUsePerSourceSubfolder} and {@link shouldUsePerPackageIdSubfolder}
 	* arguments.
-	* @param usePerSourceSubfolder If true, the path of the package output will
+	* @param shouldUsePerSourceSubfolder If true, the path of the package output will
 	* include a subfolder named after the NuGet Source.
-	* @param usePerPackageIdSubfolder If true, the path of the package output
+	* @param shouldUsePerPackageIdSubfolder If true, the path of the package output
 	* will include a subfolder named after the NuGet package's ID.
 	* @returns `dotnet pack "${this.project.Properties.MSBuildProjectFullPath}"
 	* -o "${outDir}"` where outDir may be `${cwd()}/publish/${NugetRegistryInfo.GetNameForURL(this.source)}/${this._project.Properties.PackageId}`
 	*/
-	GetPackCommand(opts, usePerSourceSubfolder = false, usePerPackageIdSubfolder = false) {
-		const validOpts = NRI.PackPackagesOptionsType.from(opts);
-		type.boolean.assert(usePerSourceSubfolder);
-		type.boolean.assert(usePerPackageIdSubfolder);
-		validOpts.output ??= node_path.join(cwd(), "publish");
-		if (usePerSourceSubfolder) validOpts.output = node_path.join(validOpts.output, NugetRegistryInfo.GetDirNameForSource(this.source), node_path.sep);
-		if (usePerPackageIdSubfolder) validOpts.output = node_path.join(validOpts.output, this._project.Properties.PackageId, node_path.sep);
-		const packCmdArr = [
+	GetPackCommand(options, shouldUsePerSourceSubfolder = false, shouldUsePerPackageIdSubfolder = false) {
+		const validOptions = NRI.PackPackagesOptionsType.from(options);
+		type.boolean.assert(shouldUsePerSourceSubfolder);
+		type.boolean.assert(shouldUsePerPackageIdSubfolder);
+		validOptions.output ??= node_path.join(cwd(), "publish");
+		if (shouldUsePerSourceSubfolder) validOptions.output = node_path.join(validOptions.output, NugetRegistryInfo.GetDirNameForSource(this.source), node_path.sep);
+		if (shouldUsePerPackageIdSubfolder) validOptions.output = node_path.join(validOptions.output, this._project.Properties.PackageId, node_path.sep);
+		const packCommandArray = [
 			"dotnet",
 			"pack",
 			`"${this._project.Properties.MSBuildProjectFullPath}"`
 		];
-		if (validOpts.artifactsPath !== void 0) packCmdArr.push("--artifactsPath", `"${validOpts.artifactsPath}"`);
-		if (validOpts.configuration !== void 0) packCmdArr.push("--configuration", validOpts.configuration);
-		if (validOpts.disableBuildServers === true) packCmdArr.push("--disable-build-servers");
-		if (validOpts.force === true) packCmdArr.push("--force");
-		if (validOpts.includeSource === true) packCmdArr.push("--include-source");
-		if (validOpts.includeSymbols === true) packCmdArr.push("--include-symbols");
-		if (validOpts.interactive === true) packCmdArr.push("--interactive");
-		if (validOpts.noBuild === true) packCmdArr.push("--no-build");
-		if (validOpts.noLogo === true) packCmdArr.push("--nologo");
-		if (validOpts.noRestore === true) packCmdArr.push("--no-restore");
-		if (validOpts.runtime !== void 0) packCmdArr.push("--runtime", validOpts.runtime);
-		if (validOpts.serviceable === true) packCmdArr.push("--serviceable");
-		if (validOpts.terminalLogger !== void 0) packCmdArr.push("--tl", validOpts.terminalLogger);
-		if (validOpts.useCurrentRuntime === true) packCmdArr.push("--use-current-runtime");
-		if (validOpts.verbosity !== void 0) packCmdArr.push("--verbosity", validOpts.verbosity);
-		if (validOpts.versionSuffix !== void 0) packCmdArr.push("--version-suffix", validOpts.versionSuffix);
+		if (validOptions.artifactsPath !== void 0) packCommandArray.push("--artifactsPath", `"${validOptions.artifactsPath}"`);
+		if (validOptions.configuration !== void 0) packCommandArray.push("--configuration", validOptions.configuration);
+		if (validOptions.disableBuildServers === true) packCommandArray.push("--disable-build-servers");
+		if (validOptions.force === true) packCommandArray.push("--force");
+		if (validOptions.includeSource === true) packCommandArray.push("--include-source");
+		if (validOptions.includeSymbols === true) packCommandArray.push("--include-symbols");
+		if (validOptions.interactive === true) packCommandArray.push("--interactive");
+		if (validOptions.noBuild === true) packCommandArray.push("--no-build");
+		if (validOptions.noLogo === true) packCommandArray.push("--nologo");
+		if (validOptions.noRestore === true) packCommandArray.push("--no-restore");
+		if (validOptions.runtime !== void 0) packCommandArray.push("--runtime", validOptions.runtime);
+		if (validOptions.serviceable === true) packCommandArray.push("--serviceable");
+		if (validOptions.terminalLogger !== void 0) packCommandArray.push("--tl", validOptions.terminalLogger);
+		if (validOptions.useCurrentRuntime === true) packCommandArray.push("--use-current-runtime");
+		if (validOptions.verbosity !== void 0) packCommandArray.push("--verbosity", validOptions.verbosity);
+		if (validOptions.versionSuffix !== void 0) packCommandArray.push("--version-suffix", validOptions.versionSuffix);
 		/**
 		* Haphazard. I need to override the Version and I'm not considering side
 		* effects of arbitrary overrides.
 		*/
-		if (validOpts.propertyOverrides) {
+		if (validOptions.propertyOverrides) {
 			/** convert propertyOverrides record to "-p:n0=v0;n1=v1;n2=v2" et cetera */
-			const assignments = "-p:" + Object.entries(validOpts.propertyOverrides).map((v) => `${v[0]}=${v[1]}`).join(";");
-			packCmdArr.push(`"${assignments}"`);
+			const assignments = "-p:" + Object.entries(validOptions.propertyOverrides).map((v) => `${v[0]}=${v[1]}`).join(";");
+			packCommandArray.push(`"${assignments}"`);
 		}
-		if (validOpts["-GetItem"] && validOpts["-GetItem"].length > 0) packCmdArr.push(`-GetItem:${validOpts["-GetItem"].join(",")}`);
-		packCmdArr.push("-o", `"${validOpts.output}"`);
-		return packCmdArr.join(" ");
+		if (validOptions["-GetItem"] && validOptions["-GetItem"].length > 0) packCommandArray.push(`-GetItem:${validOptions["-GetItem"].join(",")}`);
+		packCommandArray.push("-o", `"${validOptions.output}"`);
+		return packCommandArray.join(" ");
 	}
 	/**
 	* !Not ready for use! Remove private modifier and commit as `feat(dotnet)` when ready for release!
@@ -311,29 +311,33 @@ but the environment variable is empty or undefined.`);
 	* NuGet packages should be created during the `prepare` step, but complex
 	* configuration of `dotnet pack` via command lines intended to be invoked by
 	* `@semantic-release/exec` is impractical.
-	* @param opts `dotnet pack` options. See `dotnet pack -h`,
+	* @param options `dotnet pack` options. See `dotnet pack -h`,
 	* https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-pack, and
 	* {@link PackPackagesOptionsType}.
-	* {@link opts['-GetItem']} will _always_ have '_OutputPackItems'.
-	* @param [usePerSourceSubfolder] If `true`, modify the output path to
+	* {@link options['-GetItem']} will _always_ have '_OutputPackItems'.
+	* @param [shouldUsePerSourceSubfolder] If `true`, modify the output path to
 	* include a subfolder bearing a path-safe encoding of the NuGet Source that
 	* will receive the nupkg.
-	* @param [usePerPackageIdSubfolder] If `true`, modify the output path
+	* @param [shouldUsePerPackageIdSubfolder] If `true`, modify the output path
 	* to include a subfolder named after the the PackageId.
 	* @returns a string[] containing the full file paths of all new packages i.e.
 	* .nupkg, .symbols.nupkg, .snupkg
 	*/
-	async _PackPackages(opts, usePerSourceSubfolder = false, usePerPackageIdSubfolder = false) {
-		opts["-GetItem"] = [...opts["-GetItem"] ?? [], key_OutputPackItems];
-		const packCmd = this.GetPackCommand(opts, usePerSourceSubfolder, usePerPackageIdSubfolder);
-		let packOutput = void 0;
-		while (packOutput === void 0) packOutput = await setTimeout(1e3, execAsync(packCmd, true)).then(async (p) => await p).catch(catchEBUSY);
+	async _PackPackages(options, shouldUsePerSourceSubfolder = false, shouldUsePerPackageIdSubfolder = false) {
+		options["-GetItem"] = [...options["-GetItem"] ?? [], key_OutputPackItems];
+		const packCommand = this.GetPackCommand(options, shouldUsePerSourceSubfolder, shouldUsePerPackageIdSubfolder);
+		let packOutput;
+		while (packOutput === void 0) try {
+			packOutput = await setTimeout(1e3, execAsync(packCommand, true));
+		} catch (error) {
+			catchEBUSY(error);
+		}
 		return new MSBuildEvaluationOutput(packOutput.stdout).Items?.[key_OutputPackItems]?.filter((item) => item.Extension !== ".nuspec").map((item) => item.FullPath) ?? [];
 	}
 	/**
 	* Create a dummy package for the current {@link project} by executing a
 	* command line like \``dotnet pack ${this.project.Properties.MSBuildProjectFullPath} -p:Version=0.0.1-DUMMY -output ${getDummiesDir(this._project)}/${GetNameForURL(this.source)}`\`
-	* @param opts Options passed to
+	* @param options Options passed to
 	* `dotnet pack`, excluding the required `<PROJECT | SOLUTION>` argument.
 	* - The `output` field is ignored and overwritten. It is replaced with
 	*   ${{@link getDummiesDir}({@link project})}/${{@link GetDirNameForSource}({@link source})}
@@ -344,19 +348,28 @@ but the environment variable is empty or undefined.`);
 	* created by the Pack target, as extracted from the dotnet process's STDOUT.
 	* If mixed with other nupkgs, filter for the {@link NugetProjectProperties#PackageId}
 	*/
-	async PackDummyPackage(opts) {
-		const packCmd = this.GetPackCommand({
-			...opts,
-			output: getDummiesDir(this._project),
+	async PackDummyPackage(options) {
+		const packCommand = this.GetPackCommand({
+			...options,
+			output: getDummiesDirectory(this._project),
 			propertyOverrides: {
-				...opts.propertyOverrides,
+				...options.propertyOverrides,
 				Version: "0.0.1-DUMMY",
 				UpdateVersionProperties: "false"
 			},
-			"-GetItem": [...opts["-GetItem"] ?? [], key_OutputPackItems]
+			"-GetItem": [...options["-GetItem"] ?? [], key_OutputPackItems]
 		}, true);
-		let packOutput = void 0;
-		while (packOutput === void 0) packOutput = await setTimeout(1e3, execAsync(packCmd, true)).then(async (p) => await p).catch(catchEBUSY);
+		let packOutput;
+		let delay = 0;
+		while (packOutput === void 0) {
+			try {
+				packOutput = await setTimeout(delay, execAsync(packCommand, true));
+			} catch (error) {
+				if (delay <= 1e4) catchEBUSY(error);
+				else throw new Error("Unable to pack dummy package; (10/10) Maximum retries reached.", { cause: error });
+			}
+			delay += 1e3;
+		}
 		return new MSBuildEvaluationOutput(packOutput.stdout).Items?.[key_OutputPackItems]?.filter((item) => item.Extension !== ".nuspec").map((item) => item.FullPath) ?? [];
 	}
 	/**
@@ -408,70 +421,73 @@ but the environment variable is empty or undefined.`);
 	/**
 	* Create a `dotnet nuget push` command line from the given options and
 	* optional boolean parameters.
-	* @param opts See {@link PushPackagesOptionsType}
-	* @param usePerSourceSubfolder If `true`, the NuGet Source name or URL is formatted
+	* @param options See {@link PushPackagesOptionsType}
+	* @param shouldUsePerSourceSubfolder If `true`, the NuGet Source name or URL is formatted
 	* to a folder name and appended to the ROOT as a subfolder. Do not use
 	* wildcards in ROOT with this set to `true`!
-	* @param usePerPackageIdSubfolder  If `true`, the
+	* @param shouldUsePerPackageIdSubfolder  If `true`, the
 	* {@link project}'s {@link NugetProjectProperties#PackageId}
 	* is appended to the ROOT as a subfolder. Do not use wildcards in
 	* ROOT with this set to `true`!
 	* @returns A `dotnet nuget push` command line formatted with the
 	* appropriate arguments.
 	*/
-	GetPushCommand(opts, usePerSourceSubfolder = false, usePerPackageIdSubfolder = false) {
-		const validOpts = NRI.PushPackagesOptionsType.from(opts);
-		type.boolean.assert(usePerSourceSubfolder);
-		type.boolean.assert(usePerPackageIdSubfolder);
-		validOpts.root = validOpts.root === "" ? `${cwd()}/publish` : validOpts.root;
-		if (usePerSourceSubfolder) validOpts.root = node_path.join(validOpts.root, NugetRegistryInfo.GetDirNameForSource(this.source), node_path.sep);
-		if (usePerPackageIdSubfolder) validOpts.root = node_path.join(validOpts.root, this._project.Properties.PackageId, node_path.sep);
-		const packCmdArr = [
+	GetPushCommand(options, shouldUsePerSourceSubfolder = false, shouldUsePerPackageIdSubfolder = false) {
+		const validOptions = NRI.PushPackagesOptionsType.from(options);
+		type.boolean.assert(shouldUsePerSourceSubfolder);
+		type.boolean.assert(shouldUsePerPackageIdSubfolder);
+		validOptions.root = validOptions.root === "" ? `${cwd()}/publish` : validOptions.root;
+		if (shouldUsePerSourceSubfolder) validOptions.root = node_path.join(validOptions.root, NugetRegistryInfo.GetDirNameForSource(this.source), node_path.sep);
+		if (shouldUsePerPackageIdSubfolder) validOptions.root = node_path.join(validOptions.root, this._project.Properties.PackageId, node_path.sep);
+		const packCommandArray = [
 			"dotnet",
 			"nuget",
 			"push",
-			`"${node_path.join(validOpts.root, "*.nupkg")}"`
+			`"${node_path.join(validOptions.root, "*.nupkg")}"`
 		];
-		if (this.resolvedEnvVariable) validOpts.apiKey ??= NRI._GetTokenValue(this.resolvedEnvVariable);
+		if (this.resolvedEnvVariable) validOptions.apiKey ??= NRI._GetTokenValue(this.resolvedEnvVariable);
 		/**
 		* If apiKey is an empty string, defer to the dotnet CLI's NuGet client
 		* ability to lookup API keys saved via `dotnet nuget add source` or NuGet config
 		* files.
 		*/
-		if (validOpts.apiKey && validOpts.apiKey !== "") packCmdArr.push("--api-key", validOpts.apiKey);
-		if (validOpts.configFile) packCmdArr.push("--configfile", validOpts.configFile);
-		if (validOpts.disableBuffering === true) packCmdArr.push("--disable-buffering");
-		if (validOpts.forceEnglishOutput === true) packCmdArr.push("--force-english-output");
-		if (validOpts.interactive === true) packCmdArr.push("--interactive");
-		if (validOpts.noServiceEndpoint === true) packCmdArr.push("--no-service-endpoint");
-		if (validOpts.noSymbols === true) packCmdArr.push("--no-symbols");
-		if (validOpts.skipDuplicate === true) packCmdArr.push("--skip-duplicate");
-		validOpts.source ??= this.source;
-		packCmdArr.push("--source", validOpts.source);
-		if (validOpts.symbolApiKey !== void 0) packCmdArr.push("--symbol-api-key", validOpts.symbolApiKey);
-		if (validOpts.symbolSource !== void 0) packCmdArr.push("--symbol-source", validOpts.symbolSource);
-		if (validOpts.timeout !== void 0) packCmdArr.push("--timeout", validOpts.timeout.toString());
-		return packCmdArr.join(" ");
+		if (validOptions.apiKey && validOptions.apiKey !== "") packCommandArray.push("--api-key", validOptions.apiKey);
+		if (validOptions.configFile) packCommandArray.push("--configfile", validOptions.configFile);
+		if (validOptions.disableBuffering === true) packCommandArray.push("--disable-buffering");
+		if (validOptions.forceEnglishOutput === true) packCommandArray.push("--force-english-output");
+		if (validOptions.interactive === true) packCommandArray.push("--interactive");
+		if (validOptions.noServiceEndpoint === true) packCommandArray.push("--no-service-endpoint");
+		if (validOptions.noSymbols === true) packCommandArray.push("--no-symbols");
+		if (validOptions.skipDuplicate === true) packCommandArray.push("--skip-duplicate");
+		validOptions.source ??= this.source;
+		packCommandArray.push("--source", validOptions.source);
+		if (validOptions.symbolApiKey !== void 0) packCommandArray.push("--symbol-api-key", validOptions.symbolApiKey);
+		if (validOptions.symbolSource !== void 0) packCommandArray.push("--symbol-source", validOptions.symbolSource);
+		if (validOptions.timeout !== void 0) packCommandArray.push("--timeout", validOptions.timeout.toString());
+		return packCommandArray.join(" ");
 	}
 	/**
 	* Immediately push packages. The input path may be modified according to the
-	* {@link usePerSourceSubfolder} and {@link usePerPackageIdSubfolder}
+	* {@link shouldUsePerSourceSubfolder} and {@link shouldUsePerPackageIdSubfolder}
 	* arguments.
-	* @param opts The `dotnet nuget push` command line options, including the
+	* @param options The `dotnet nuget push` command line options, including the
 	* ROOT argument, the directory containing local nuget packages ready to be
 	* pushed.
-	* @param usePerSourceSubfolder If `true`, the NuGet Source name or URL is formatted
+	* @param shouldUsePerSourceSubfolder If `true`, the NuGet Source name or URL is formatted
 	* to a folder name and appended to the ROOT as a subfolder. Do not use
 	* wildcards in ROOT with this set to `true`!
-	* @param usePerPackageIdSubfolder If `true`, the current {@link project}'s
+	* @param shouldUsePerPackageIdSubfolder If `true`, the current {@link project}'s
 	* PackageId is appended to the ROOT as a subfolder. Do not use wildcards in
 	* ROOT with this set to `true`!
 	*/
-	async _PushPackages(opts, usePerSourceSubfolder = false, usePerPackageIdSubfolder = false) {
-		await execAsync(this.GetPushCommand(opts, usePerSourceSubfolder, usePerPackageIdSubfolder), true).catch((error) => {
-			const _error = isError(error) ? error : new Error(JSON.stringify(error));
-			throw opts.apiKey ? _censorTokenInError(_error, opts.apiKey) : _error;
-		});
+	async _PushPackages(options, shouldUsePerSourceSubfolder = false, shouldUsePerPackageIdSubfolder = false) {
+		let command = "";
+		try {
+			await execAsync(command = this.GetPushCommand(options, shouldUsePerSourceSubfolder, shouldUsePerPackageIdSubfolder), true);
+		} catch (error) {
+			const _error = Object.assign(isError(error) ? error : new Error(JSON.stringify(error)), { cmd: command });
+			throw options.apiKey ? _censorTokenInError(_error, options.apiKey) : _error;
+		}
 	}
 	/**
 	*
@@ -492,17 +508,17 @@ but the environment variable is empty or undefined.`);
 	*   nri.GetPushDummyPackageCommand(pushOpts, false, false),
 	* ].join(' && ')
 	* ```
-	* @param opts options for `dotnet nuget push`. The following
+	* @param options options for `dotnet nuget push`. The following
 	* fields are overwritten:
 	* - root: getDummiesDir(this.project)
 	* - skipDuplicates: true
 	* @returns a `dotnet nuget push` command to push a dummy package
 	* (created by executing {@link PackDummyPackage}) to {@link source}
 	*/
-	GetPushDummyCommand(opts) {
+	GetPushDummyCommand(options) {
 		return this.GetPushCommand({
-			...NRI.PushDummyPackagesOptionsType.from(opts),
-			root: getDummiesDir(this._project)
+			...NRI.PushDummyPackagesOptionsType.from(options),
+			root: getDummiesDirectory(this._project)
 		}, true);
 	}
 	/**
@@ -510,17 +526,20 @@ but the environment variable is empty or undefined.`);
 	* @throws {Error} when the process exits with an error code indicating
 	* failure i.e. the command line is invalid, the process fails to start,
 	* the push fails, et cetera.
-	* @param opts the ROOT arg and options for `dotnet nuget push`. The following
+	* @param options the ROOT arg and options for `dotnet nuget push`. The following
 	* fields are overwritten:
 	* - root: getDummiesDir(this.project)
 	* - skipDuplicates: true
 	* @returns The return type of {@link execAsync} i.e. a {@link Promise} resolving to `{ stdout: string; stderr: string }`.
 	*/
-	async _PushDummyPackages(opts) {
-		return await execAsync(this.GetPushDummyCommand(opts), true).catch((error) => {
-			const _error = isError(error) ? error : new Error(String(error));
-			throw opts.apiKey ? _censorTokenInError(_error, opts.apiKey) : _error;
-		});
+	async _PushDummyPackages(options) {
+		const pushCommand = this.GetPushDummyCommand(options);
+		try {
+			return await execAsync(pushCommand, true);
+		} catch (error) {
+			const _error = Object.assign(isError(error) ? error : new Error(JSON.stringify(error)), { cmd: pushCommand });
+			throw options.apiKey ? _censorTokenInError(_error, options.apiKey) : _error;
+		}
 	}
 	static _NugetSearchReturnTypes = { ExactMatch: { v2: type({
 		version: "2",
@@ -554,7 +573,9 @@ but the environment variable is empty or undefined.`);
 	*/
 	static async IsNextVersionAlreadyPublished(source, packageId, nextVersion) {
 		if (nextVersion === "") throw new Error("The value of nextVersion is empty");
-		return await execAsync(`dotnet package search --format JSON --exact-match --source ${source} --prerelease ${packageId}`, true).then((stdPair) => stdPair.stdout).then((json) => this._ParseNugetSearchReturn(json)).then((errsOrObj) => errsOrObj instanceof type.errors ? errsOrObj.throw() : errsOrObj).then((obj) => obj.searchResult).then((results) => results[0].packages).then((pkgs) => pkgs.find((p) => p.version === type("string.semver").from(nextVersion))).then((pkg) => pkg !== void 0);
+		const json = (await execAsync(`dotnet package search --format JSON --exact-match --source ${source} --prerelease ${packageId}`, true)).stdout;
+		const errsOrObject = this._ParseNugetSearchReturn(json);
+		return (errsOrObject instanceof type.errors ? errsOrObject.throw() : errsOrObject).searchResult[0].packages.find((p) => p.version === type("string.semver").from(nextVersion)) !== void 0;
 	}
 	/**
 	* !WARNING: GITHUB_OUTPUT must be the full path to an environment file.
@@ -657,11 +678,12 @@ function _censorToken(string, token) {
 * NuGet API token.
 */
 function _censorTokenInError(error, token) {
-	return Object.assign(error, JSON.parse(_censorToken(JSON.stringify({
+	const text = JSON.stringify({
 		...error,
 		message: error.message,
 		stack: error.stack
-	}), token)));
+	});
+	return Object.assign(error, JSON.parse(_censorToken(text, token)));
 }
 //#endregion
 export { NRIOpts, NRIOptsBase, NugetRegistryInfo, getGithubOutput, getGithubOutputSync };