pnpm-settings-migrator 0.6.0 → 0.6.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import process from "node:process";
 import { cac } from "cac";
-import consola, { consola as consola$1 } from "consola";
+import consola$1, { consola } from "consola";
 import { isPlainObject, isUndefined, pick } from "@ntnyq/utils";
 import { defu } from "defu";
 import detectIndent from "detect-indent";
@@ -13,7 +13,7 @@ import { readIniFile } from "read-ini-file";
 import { kebabCase } from "uncase";
 //#region package.json
 var name = "pnpm-settings-migrator";
-var version = "0.6.0";
+var version = "0.6.1";
 //#endregion
 //#region src/constants.ts
 const NPMRC = ".npmrc";
@@ -309,7 +309,7 @@ function mergeWithArrayDedupe(existing, incoming) {
 	for (const [key, incomingValue] of Object.entries(incoming)) {
 		const existingValue = result[key];
 		if (isUndefined(existingValue)) result[key] = incomingValue;
-		else if (Array.isArray(existingValue) && Array.isArray(incomingValue)) result[key] = Array.from(new Set([...existingValue, ...incomingValue]));
+		else if (Array.isArray(existingValue) && Array.isArray(incomingValue)) result[key] = Array.from(/* @__PURE__ */ new Set([...existingValue, ...incomingValue]));
 		else if (isPlainObject(existingValue) && isPlainObject(incomingValue)) result[key] = mergeWithArrayDedupe(existingValue, incomingValue);
 	}
 	return result;
@@ -477,10 +477,10 @@ async function migratePnpmSettings(rawOptions = {}) {
 			fsExists(packageJsonPath),
 			fsExists(pnpmWorkspaceYamlPath)
 		]);
-		if (!npmrcExists) consola.info(`${dim(NPMRC)} not found`);
-		if (!packageJsonExists) consola.info(`${dim(PACKAGE_JSON)} not found`);
+		if (!npmrcExists) consola$1.info(`${dim(NPMRC)} not found`);
+		if (!packageJsonExists) consola$1.info(`${dim(PACKAGE_JSON)} not found`);
 		if (!npmrcExists && !packageJsonExists) {
-			consola.warn("No pnpm settings files to migrate");
+			consola$1.warn("No pnpm settings files to migrate");
 			return;
 		}
 		let packageJsonIndent = 2;
@@ -494,8 +494,8 @@ async function migratePnpmSettings(rawOptions = {}) {
 		}
 		if (pnpmWorkspaceExists) {
 			const content = await fsReadFile(pnpmWorkspaceYamlPath);
-			pnpmWorkspaceYamlIndent = detectIndent(content).amount;
-			pnpmWorkspaceYamlObject = parse(content);
+			pnpmWorkspaceYamlIndent = resolveYamlIndent(content);
+			pnpmWorkspaceYamlObject = parse(content) ?? {};
 		}
 		const compatibility = resolveCompatibilityTarget(options.compatibility, packageJsonObject.packageManager);
 		const npmrcMigratable = npmrcExists ? compatibility === "v10" ? {
@@ -510,7 +510,7 @@ async function migratePnpmSettings(rawOptions = {}) {
 		const hasResolutions = options.yarnResolutions && !!packageJsonObject.resolutions;
 		const hasNpmrcSettings = Object.keys(pnpmSettingsInNpmrc).length > 0;
 		if (!hasPnpmInPackageJson && !hasResolutions && !hasNpmrcSettings) {
-			consola.warn("No pnpm settings fields to migrate");
+			consola$1.warn("No pnpm settings fields to migrate");
 			return;
 		}
 		const pnpmSettingsInPackageJson = options.yarnResolutions && packageJsonObject.resolutions ? {
@@ -540,7 +540,7 @@ async function migratePnpmSettings(rawOptions = {}) {
 			await fsWriteFile(packageJsonPath, JSON.stringify(packageJsonObject, null, packageJsonIndent));
 		}
 	} catch (err) {
-		consola.error("Failed to migrate pnpm settings:", err);
+		consola$1.error("Failed to migrate pnpm settings:", err);
 		throw err;
 	}
 }
@@ -575,19 +575,23 @@ function resolveCompatibilityTarget(compatibility, packageManager) {
 	const [, major] = (packageManager || "").match(/^pnpm@(\d+)(?:\.|$)/) || [];
 	return Number(major) >= 11 ? "v11" : "v10";
 }
+function resolveYamlIndent(content) {
+	const detectedIndent = detectIndent(content).amount;
+	return detectedIndent > 0 ? detectedIndent : 2;
+}
 //#endregion
 //#region src/cli.ts
 const cli = cac(name);
 cli.version(version).option("--cwd [cwd]", "Current working directory").option("--sort-keys", "Sort keys when write pnpm-workspace.yaml").option("--compatibility <compatibility>", "Compatibility target (auto, v10, v11)").option("--replace-deprecated", "Replace deprecated pnpm settings with new ones and remove old keys").option("--strategy <strategy>", "Strategy to handle conflicts (discard, merge, overwrite)").option("--no-yarn-resolutions", "Disable migrating resolutions field in package.json").option("--no-newline-between", "Disable adding newlines between each root keys").option("--no-clean-npmrc", "Disable removing pnpm settings in .npmrc file").option("--no-clean-package-json", "Disable removing pnpm fields in package.json").help();
 cli.command("").action(async (options) => {
 	try {
-		consola$1.log(`\n${bold(magenta(name))} ${dim(`v${version}`)}`);
-		consola$1.log(dim("\n--------------\n"));
+		consola.log(`\n${bold(magenta(name))} ${dim(`v${version}`)}`);
+		consola.log(dim("\n--------------\n"));
 		await migratePnpmSettings(options);
-		consola$1.success(green("pnpm settings migrate has finished"));
+		consola.success(green("pnpm settings migrate has finished"));
 	} catch (err) {
-		consola$1.fail(red(String(err)));
-		if (err instanceof Error && err.stack) consola$1.fail(dim(err.stack?.split("\n").slice(1).join("\n")));
+		consola.fail(red(String(err)));
+		if (err instanceof Error && err.stack) consola.fail(dim(err.stack?.split("\n").slice(1).join("\n")));
 		process.exit(1);
 	}
 });

package/dist/index.mjs

@@ -304,7 +304,7 @@ function mergeWithArrayDedupe(existing, incoming) {
 	for (const [key, incomingValue] of Object.entries(incoming)) {
 		const existingValue = result[key];
 		if (isUndefined(existingValue)) result[key] = incomingValue;
-		else if (Array.isArray(existingValue) && Array.isArray(incomingValue)) result[key] = Array.from(new Set([...existingValue, ...incomingValue]));
+		else if (Array.isArray(existingValue) && Array.isArray(incomingValue)) result[key] = Array.from(/* @__PURE__ */ new Set([...existingValue, ...incomingValue]));
 		else if (isPlainObject(existingValue) && isPlainObject(incomingValue)) result[key] = mergeWithArrayDedupe(existingValue, incomingValue);
 	}
 	return result;
@@ -489,8 +489,8 @@ async function migratePnpmSettings(rawOptions = {}) {
 		}
 		if (pnpmWorkspaceExists) {
 			const content = await fsReadFile(pnpmWorkspaceYamlPath);
-			pnpmWorkspaceYamlIndent = detectIndent(content).amount;
-			pnpmWorkspaceYamlObject = parse(content);
+			pnpmWorkspaceYamlIndent = resolveYamlIndent(content);
+			pnpmWorkspaceYamlObject = parse(content) ?? {};
 		}
 		const compatibility = resolveCompatibilityTarget(options.compatibility, packageJsonObject.packageManager);
 		const npmrcMigratable = npmrcExists ? compatibility === "v10" ? {
@@ -570,5 +570,9 @@ function resolveCompatibilityTarget(compatibility, packageManager) {
 	const [, major] = (packageManager || "").match(/^pnpm@(\d+)(?:\.|$)/) || [];
 	return Number(major) >= 11 ? "v11" : "v10";
 }
+function resolveYamlIndent(content) {
+	const detectedIndent = detectIndent(content).amount;
+	return detectedIndent > 0 ? detectedIndent : 2;
+}
 //#endregion
 export { migratePnpmSettings, resolveOptions };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm-settings-migrator",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Move pnpm settings from `pnpm` field in `package.json` and `.npmrc` file to `pnpm-workspace.yaml`",
   "keywords": [
     "migrator",
@@ -40,7 +40,7 @@
   "sideEffects": false,
   "dependencies": {
     "@ntnyq/utils": "^0.15.0",
-    "@pnpm/types": "^1101.3.0",
+    "@pnpm/types": "^1101.3.2",
     "cac": "^7.0.0",
     "camelcase-keys": "^10.0.2",
     "consola": "^3.4.2",
@@ -53,16 +53,16 @@
   },
   "devDependencies": {
     "@ntnyq/eslint-config": "^6.1.5",
-    "@types/node": "^25.9.2",
-    "@typescript/native-preview": "^7.0.0-dev.20260607.1",
+    "@types/node": "^26.0.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260620.1",
     "bumpp": "^11.1.0",
-    "eslint": "^10.4.1",
+    "eslint": "^10.5.0",
     "husky": "^9.1.7",
     "nano-staged": "^1.0.2",
-    "npm-run-all2": "^9.0.1",
-    "oxfmt": "^0.53.0",
-    "tsdown": "^0.22.2",
-    "vitest": "^4.1.8"
+    "npm-run-all2": "^9.0.2",
+    "oxfmt": "^0.55.0",
+    "tsdown": "^0.22.3",
+    "vitest": "^4.1.9"
   },
   "nano-staged": {
     "*.{js,ts,mjs,tsx,md,yml,yaml,toml,json}": "eslint --fix",