pnpm-settings-migrator 0.1.0 → 0.3.0

package/README.md

@@ -31,34 +31,183 @@ Current working directory.
 
 Sort keys when write `pnpm-workspace.yaml`.
 
+### `--strategy`
+
+- **Type**: `'discard' | 'merge' | 'overwrite'`
+- **Default**: `'merge'`
+
+Strategy to handle conflicts when merging settings with existing `pnpm-workspace.yaml`:
+
+- `discard`: Keep existing values, only add new keys from incoming settings. For nested objects, merges keys from both.
+- `merge`: Deep merge with array deduplication. Arrays are combined and deduplicated, objects are recursively merged, primitives keep existing values.
+- `overwrite`: Use incoming values, only keep existing keys not present in incoming settings. For nested objects, merges keys from both.
+
 ### `--no-yarn-resolutions`
 
 - **Type**: `boolean`
-- **Default**: `false`
+- **Default behavior**: `yarnResolutions=true` (use this flag to disable)
 
 Disable migrating `resolutions` field in `package.json`.
 
 ### `--no-clean-npmrc`
 
 - **Type**: `boolean`
-- **Default**: `false`
+- **Default behavior**: `cleanNpmrc=true` (use this flag to disable)
 
 Disable removing pnpm settings in `.npmrc` file.
 
 ### `--no-clean-package-json`
 
 - **Type**: `boolean`
-- **Default**: `false`
+- **Default behavior**: `cleanPackageJson=true` (use this flag to disable)
 
 Disable removing `pnpm` field in `package.json`.
 
 ### `--no-newline-between`
 
 - **Type**: `boolean`
-- **Default**: `false`
+- **Default behavior**: `newlineBetween=true` (use this flag to disable)
 
 Disable adding newlines between each root keys.
 
+## Merge Strategy Examples
+
+This document demonstrates how different merge strategies work when migrating pnpm settings.
+
+### Scenario
+
+Existing `pnpm-workspace.yaml`:
+
+```yaml
+packages:
+  - packages/*
+
+overrides:
+  foo: 1.0.0
+```
+
+Settings from `package.json`:
+
+```json
+{
+  "pnpm": {
+    "packages": ["apps/*"],
+    "overrides": {
+      "bar": "2.0.0"
+    }
+  }
+}
+```
+
+### Strategy: `discard` (Keep Existing)
+
+```bash
+pnpm dlx pnpm-settings-migrator --strategy discard
+```
+
+**Result:**
+
+```yaml
+packages:
+  - packages/* # Kept existing array value
+
+overrides:
+  foo: 1.0.0 # Kept existing key
+  bar: 2.0.0 # Added new key from package.json
+```
+
+Use this when you want to preserve your existing configuration and only add new settings.
+
+### Strategy: `merge` (Smart Merge - Default)
+
+```bash
+pnpm dlx pnpm-settings-migrator --strategy merge
+```
+
+**Result:**
+
+```yaml
+packages:
+  - packages/* # From existing
+  - apps/* # From package.json (deduplicated)
+
+overrides:
+  foo: 1.0.0 # From existing
+  bar: 2.0.0 # From package.json
+```
+
+Use this for intelligent merging that combines arrays and deeply merges objects.
+
+### Strategy: `overwrite` (Use Incoming)
+
+```bash
+pnpm dlx pnpm-settings-migrator --strategy overwrite
+```
+
+**Result:**
+
+```yaml
+packages:
+  - apps/* # Replaced with incoming array value
+
+overrides:
+  foo: 1.0.0 # Kept existing key (not in incoming)
+  bar: 2.0.0 # Added new key from package.json
+```
+
+Use this when you want to prioritize settings from `package.json` and `.npmrc`.
+
+### Advanced Example
+
+Existing `pnpm-workspace.yaml`:
+
+```yaml
+packages:
+  - packages/*
+  - common
+
+overrides:
+  react: 18.0.0
+
+peerDependencyRules:
+  ignoreMissing:
+    - react-dom
+```
+
+Settings from `package.json`:
+
+```json
+{
+  "pnpm": {
+    "packages": ["apps/*", "common"],
+    "overrides": {
+      "vue": "3.0.0"
+    },
+    "peerDependencyRules": {
+      "ignoreMissing": ["vue-router"]
+    }
+  }
+}
+```
+
+#### With `--strategy merge`:
+
+```yaml
+packages:
+  - packages/*
+  - common # Deduplicated
+  - apps/*
+
+overrides:
+  react: 18.0.0
+  vue: 3.0.0
+
+peerDependencyRules:
+  ignoreMissing:
+    - react-dom
+    - vue-router # Arrays merged and deduplicated
+```
+
 ## Context
 
 - [Moving settings to pnpm-workspace.yaml](https://github.com/orgs/pnpm/discussions/9037)

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 import process from "node:process";
 import { cac } from "cac";
 import consola, { consola as consola$1 } from "consola";
-import { pick } from "@ntnyq/utils";
+import { isPlainObject, isUndefined, pick } from "@ntnyq/utils";
 import { defu } from "defu";
 import detectIndent from "detect-indent";
 import { resolve } from "pathe";
@@ -11,21 +11,15 @@ import { getColor } from "consola/utils";
 import camelcaseKeys from "camelcase-keys";
 import { readIniFile } from "read-ini-file";
 import { kebabCase } from "uncase";
-
 //#region package.json
 var name = "pnpm-settings-migrator";
-var version = "0.1.0";
-
+var version = "0.3.0";
 //#endregion
 //#region src/constants.ts
 const NPMRC = ".npmrc";
 const PACKAGE_JSON = "package.json";
 const PNPM_WORKSPACE_YAML = "pnpm-workspace.yaml";
 /**
-* Default indent: 2 spaces
-*/
-const DEFAULT_INDENT = 2;
-/**
 * @see {@link https://github.com/pnpm/pnpm/blob/main/packages/types/src/package.ts}
 */
 const PNPM_SETTINGS_FIELDS = [
@@ -36,21 +30,26 @@ const PNPM_SETTINGS_FIELDS = [
 	"auditConfig",
 	"configDependencies",
 	"executionEnv",
+	"httpProxy",
+	"httpsProxy",
 	"ignoredBuiltDependencies",
 	"ignoredOptionalDependencies",
 	"ignorePatchFailures",
 	"neverBuiltDependencies",
+	"nodeDownloadMirrors",
+	"noProxy",
+	"npmrcAuthFile",
 	"onlyBuiltDependencies",
 	"onlyBuiltDependenciesFile",
 	"overrides",
 	"packageExtensions",
 	"patchedDependencies",
 	"peerDependencyRules",
+	"registries",
 	"requiredScripts",
 	"supportedArchitectures",
 	"updateConfig"
 ];
-
 //#endregion
 //#region src/options.ts
 /**
@@ -65,6 +64,11 @@ const DEFAULT_OPTIONS = {
 	strategy: "merge",
 	yarnResolutions: true
 };
+const VALID_STRATEGIES = [
+	"discard",
+	"merge",
+	"overwrite"
+];
 /**
 * Resolve and normalize migration options with defaults.
 *
@@ -92,12 +96,16 @@ function resolveOptions(options = {}) {
 		cwd: options.cwd ?? DEFAULT_OPTIONS.cwd,
 		newlineBetween: options.newlineBetween ?? DEFAULT_OPTIONS.newlineBetween,
 		sortKeys: options.sortKeys ?? DEFAULT_OPTIONS.sortKeys,
-		strategy: options.strategy ?? DEFAULT_OPTIONS.strategy,
+		strategy: resolveStrategy(options.strategy),
 		yarnResolutions: options.yarnResolutions ?? DEFAULT_OPTIONS.yarnResolutions,
 		cleanPackageJson: options.cleanPackageJson ?? DEFAULT_OPTIONS.cleanPackageJson
 	};
 }
-
+function resolveStrategy(strategy) {
+	if (!strategy) return DEFAULT_OPTIONS.strategy;
+	if (VALID_STRATEGIES.includes(strategy)) return strategy;
+	throw new Error(`Invalid strategy: ${strategy}. Expected one of: ${VALID_STRATEGIES.join(", ")}`);
+}
 //#endregion
 //#region src/utils/fs.ts
 /**
@@ -124,17 +132,88 @@ async function fsReadFile(path) {
 async function fsWriteFile(path, content) {
 	await writeFile(path, `${content.trimEnd()}\n`, "utf-8");
 }
-
-//#endregion
-//#region src/utils/color.ts
-const cyan = getColor("cyan");
-const yellow = getColor("yellow");
+getColor("cyan");
+getColor("yellow");
 const dim = getColor("dim");
 const green = getColor("green");
 const red = getColor("red");
 const bold = getColor("bold");
 const magenta = getColor("magenta");
-
+//#endregion
+//#region src/utils/merge.ts
+/**
+* Merge two objects based on the specified strategy.
+*
+* @param existing - Existing pnpm-workspace.yaml content
+* @param incoming - New settings from package.json and .npmrc
+* @param strategy - Merge strategy to use
+*
+* @returns Merged pnpm workspace configuration
+*
+* @example
+* ```ts
+* // Discard strategy - keep existing values
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'discard')
+* // => { packages: ['a'] }
+*
+* // Merge strategy - combine arrays with deduplication
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'merge')
+* // => { packages: ['a', 'b'] }
+*
+* // Overwrite strategy - use incoming values
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'overwrite')
+* // => { packages: ['b'] }
+* ```
+*/
+function mergeByStrategy(existing, incoming, strategy) {
+	switch (strategy) {
+		case "discard": return discardMerge(existing, incoming);
+		case "merge": return mergeWithArrayDedupe(existing, incoming);
+		case "overwrite": return discardMerge(incoming, existing);
+		default: return defu(existing, incoming);
+	}
+}
+/**
+* Merge objects with priority to the first argument.
+* Only adds keys from second argument that don't exist in first.
+* For nested objects, recursively merges them.
+*
+* @param priority - Object with priority values
+* @param fallback - Object with fallback values
+*
+* @returns Merged result
+*/
+function discardMerge(priority, fallback) {
+	const result = { ...priority };
+	for (const [key, fallbackValue] of Object.entries(fallback)) {
+		const priorityValue = result[key];
+		if (isUndefined(priorityValue)) result[key] = fallbackValue;
+		else if (isPlainObject(priorityValue) && isPlainObject(fallbackValue)) result[key] = discardMerge(priorityValue, fallbackValue);
+	}
+	return result;
+}
+/**
+* Deep merge two objects with array deduplication.
+*
+* For arrays, this function takes the union of both arrays and removes duplicates.
+* For objects, it recursively merges them.
+* For primitives, it prefers existing values.
+*
+* @param existing - Existing values
+* @param incoming - New values
+*
+* @returns Merged result with deduplicated arrays
+*/
+function mergeWithArrayDedupe(existing, incoming) {
+	const result = { ...existing };
+	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 (isPlainObject(existingValue) && isPlainObject(incomingValue)) result[key] = mergeWithArrayDedupe(existingValue, incomingValue);
+	}
+	return result;
+}
 //#endregion
 //#region src/utils/npmrc.ts
 /**
@@ -181,7 +260,6 @@ async function pruneNpmrc(path) {
 async function readNpmrc(path) {
 	return camelcaseKeys(await readIniFile(path));
 }
-
 //#endregion
 //#region src/core.ts
 /**
@@ -235,9 +313,9 @@ async function migratePnpmSettings(rawOptions = {}) {
 			consola.warn("No pnpm settings files to migrate");
 			return;
 		}
-		let packageJsonIndent = DEFAULT_INDENT;
+		let packageJsonIndent = 2;
 		let packageJsonObject = {};
-		let pnpmWorkspaceYamlIndent = DEFAULT_INDENT;
+		let pnpmWorkspaceYamlIndent = 2;
 		let pnpmWorkspaceYamlObject = {};
 		if (packageJsonExists) {
 			const content = await fsReadFile(packageJsonPath);
@@ -262,19 +340,20 @@ async function migratePnpmSettings(rawOptions = {}) {
 			overrides: defu(packageJsonObject.pnpm?.overrides, packageJsonObject.resolutions)
 		} : { ...packageJsonObject.pnpm };
 		if (pnpmSettingsInPackageJson.overrides && !Object.keys(pnpmSettingsInPackageJson.overrides).length) delete pnpmSettingsInPackageJson.overrides;
-		const pnpmWorkspaceResult = defu(pnpmWorkspaceYamlObject, {
+		const incomingSettings = {
 			...pnpmSettingsInNpmrc,
 			...pnpmSettingsInPackageJson
-		});
+		};
+		const pnpmWorkspaceResult = mergeByStrategy(pnpmWorkspaceYamlObject, incomingSettings, options.strategy);
 		const yamlDocument = new Document({}, { sortMapEntries: options.sortKeys });
-		Object.entries(pnpmWorkspaceResult).forEach(([key, value], index) => {
+		Object.entries(pnpmWorkspaceResult).forEach(([key, value]) => {
 			yamlDocument.add({
 				key,
 				value
 			});
-			if (options.newlineBetween && index < Object.keys(pnpmWorkspaceResult).length - 1) {}
 		});
-		await fsWriteFile(pnpmWorkspaceYamlPath, yamlDocument.toString({ indent: pnpmWorkspaceYamlIndent }));
+		const yamlContent = yamlDocument.toString({ indent: pnpmWorkspaceYamlIndent });
+		await fsWriteFile(pnpmWorkspaceYamlPath, options.newlineBetween ? yamlContent.replace(/\n(?=[^\s#][^:\n]*:)/g, "\n\n") : yamlContent);
 		if (npmrcExists && options.cleanNpmrc) await pruneNpmrc(npmrcPath);
 		if (packageJsonExists && options.cleanPackageJson && (packageJsonObject.pnpm || packageJsonObject.resolutions)) {
 			delete packageJsonObject.pnpm;
@@ -286,11 +365,10 @@ async function migratePnpmSettings(rawOptions = {}) {
 		throw err;
 	}
 }
-
 //#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("--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.version(version).option("--cwd [cwd]", "Current working directory").option("--sort-keys", "Sort keys when write pnpm-workspace.yaml").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}`)}`);
@@ -304,6 +382,5 @@ cli.command("").action(async (options) => {
 	}
 });
 cli.parse();
-
 //#endregion
-export {  };
+export {};

package/dist/index.d.mts

@@ -1,6 +1,13 @@
 import { PnpmSettings } from "@pnpm/types";
 
-//#region src/options.d.ts
+//#region src/types.d.ts
+/**
+ * Merge strategy for combining pnpm settings
+ */
+type MergeStrategy = 'discard' | 'merge' | 'overwrite';
+/**
+ * Options for pnpm settings migration
+ */
 interface Options {
   /**
    * Whether to remove pnpm settings in `.npmrc` file
@@ -34,7 +41,7 @@ interface Options {
   /**
    * Strategy to handle conflicts
    */
-  strategy?: 'discard' | 'merge' | 'overwrite';
+  strategy?: MergeStrategy;
   /**
    * Whether to migrate `resolutions` filed in `package.json`
    *
@@ -43,27 +50,67 @@ interface Options {
   yarnResolutions?: boolean;
 }
 /**
- * Resolve and normalize migration options with defaults.
- *
- * This function takes partial options and returns a complete options object
- * with all properties set to either the provided value or the default value.
- *
- * @param options - Partial migration options
- *
- * @returns Complete options object with all required properties
- *
- * @example
- * ```ts
- * // Use all defaults
- * const opts = resolveOptions()
- * // { cleanNpmrc: true, cleanPackageJson: true, cwd: '/current/dir', ... }
- *
- * // Override specific options
- * const opts = resolveOptions({ sortKeys: true, cleanNpmrc: false })
- * // { cleanNpmrc: false, cleanPackageJson: true, sortKeys: true, ... }
- * ```
+ * legacy `pnpm-workspace` types
  */
-declare function resolveOptions(options?: Options): Required<Options>;
+type PnpmWorkspaceLegacy = {
+  catalog?: Record<string, string>;
+  catalogs?: Record<string, Record<string, string>>;
+  packages?: string[];
+};
+/**
+ * `package-json` types
+ * @pg
+ */
+interface PackageJson {
+  /**
+   * same as `pnpm.overrides`
+   *
+   * @compatibility npm, bun
+   */
+  overrides?: Record<string, string>;
+  /**
+   * pnpm settings
+   */
+  pnpm?: PnpmSettings;
+  /**
+   * same as `pnpm.overrides`
+   *
+   * @compatibility yarn, bun
+   */
+  resolutions?: Record<string, string>;
+}
+/**
+ * `.npmrc` types
+ * @pg
+ */
+type NpmRC = Record<string, any>;
+/**
+ * Deprecated `pnpm` settings in `package.json`
+ * @see {@link https://github.com/pnpm/pnpm/blob/main/core/types/CHANGELOG.md#major-changes}
+ */
+interface PnpmSettingsDeprecated {
+  /**
+   * @deprecated
+   */
+  ignoredBuiltDependencies?: string[];
+  /**
+   * @deprecated
+   */
+  neverBuiltDependencies?: string[];
+  /**
+   * @deprecated
+   */
+  onlyBuiltDependencies?: string[];
+  /**
+   * @deprecated
+   */
+  onlyBuiltDependenciesFile?: string;
+}
+/**
+ * `pnpm-workspace` types
+ * @pg
+ */
+type PnpmWorkspace = PnpmSettings & PnpmSettingsDeprecated & PnpmWorkspaceLegacy;
 //#endregion
 //#region src/core.d.ts
 /**
@@ -102,46 +149,28 @@ declare function resolveOptions(options?: Options): Required<Options>;
  */
 declare function migratePnpmSettings(rawOptions?: Options): Promise<void>;
 //#endregion
-//#region src/types.d.ts
-/**
- * legacy `pnpm-workspace` types
- */
-type PnpmWorkspaceLegacy = {
-  catalog?: Record<string, string>;
-  catalogs?: Record<string, Record<string, string>>;
-  packages?: string[];
-};
-/**
- * `package-json` types
- * @pg
- */
-interface PackageJson {
-  /**
-   * same as `pnpm.overrides`
-   *
-   * @compatibility npm, bun
-   */
-  overrides?: Record<string, string>;
-  /**
-   * pnpm settings
-   */
-  pnpm?: PnpmSettings;
-  /**
-   * same as `pnpm.overrides`
-   *
-   * @compatibility yarn, bun
-   */
-  resolutions?: Record<string, string>;
-}
-/**
- * `.npmrc` types
- * @pg
- */
-type NpmRC = Record<string, any>;
+//#region src/options.d.ts
 /**
- * `pnpm-workspace` types
- * @pg
+ * Resolve and normalize migration options with defaults.
+ *
+ * This function takes partial options and returns a complete options object
+ * with all properties set to either the provided value or the default value.
+ *
+ * @param options - Partial migration options
+ *
+ * @returns Complete options object with all required properties
+ *
+ * @example
+ * ```ts
+ * // Use all defaults
+ * const opts = resolveOptions()
+ * // { cleanNpmrc: true, cleanPackageJson: true, cwd: '/current/dir', ... }
+ *
+ * // Override specific options
+ * const opts = resolveOptions({ sortKeys: true, cleanNpmrc: false })
+ * // { cleanNpmrc: false, cleanPackageJson: true, sortKeys: true, ... }
+ * ```
  */
-type PnpmWorkspace = PnpmSettings & PnpmWorkspaceLegacy;
+declare function resolveOptions(options?: Options): Required<Options>;
 //#endregion
-export { NpmRC, Options, PackageJson, PnpmWorkspace, PnpmWorkspaceLegacy, migratePnpmSettings, resolveOptions };
+export { MergeStrategy, NpmRC, Options, PackageJson, PnpmSettingsDeprecated, PnpmWorkspace, PnpmWorkspaceLegacy, migratePnpmSettings, resolveOptions };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { pick } from "@ntnyq/utils";
+import { isPlainObject, isUndefined, pick } from "@ntnyq/utils";
 import consola from "consola";
 import { defu } from "defu";
 import detectIndent from "detect-indent";
@@ -10,16 +10,11 @@ import { getColor } from "consola/utils";
 import camelcaseKeys from "camelcase-keys";
 import { readIniFile } from "read-ini-file";
 import { kebabCase } from "uncase";
-
 //#region src/constants.ts
 const NPMRC = ".npmrc";
 const PACKAGE_JSON = "package.json";
 const PNPM_WORKSPACE_YAML = "pnpm-workspace.yaml";
 /**
-* Default indent: 2 spaces
-*/
-const DEFAULT_INDENT = 2;
-/**
 * @see {@link https://github.com/pnpm/pnpm/blob/main/packages/types/src/package.ts}
 */
 const PNPM_SETTINGS_FIELDS = [
@@ -30,21 +25,26 @@ const PNPM_SETTINGS_FIELDS = [
 	"auditConfig",
 	"configDependencies",
 	"executionEnv",
+	"httpProxy",
+	"httpsProxy",
 	"ignoredBuiltDependencies",
 	"ignoredOptionalDependencies",
 	"ignorePatchFailures",
 	"neverBuiltDependencies",
+	"nodeDownloadMirrors",
+	"noProxy",
+	"npmrcAuthFile",
 	"onlyBuiltDependencies",
 	"onlyBuiltDependenciesFile",
 	"overrides",
 	"packageExtensions",
 	"patchedDependencies",
 	"peerDependencyRules",
+	"registries",
 	"requiredScripts",
 	"supportedArchitectures",
 	"updateConfig"
 ];
-
 //#endregion
 //#region src/options.ts
 /**
@@ -59,6 +59,11 @@ const DEFAULT_OPTIONS = {
 	strategy: "merge",
 	yarnResolutions: true
 };
+const VALID_STRATEGIES = [
+	"discard",
+	"merge",
+	"overwrite"
+];
 /**
 * Resolve and normalize migration options with defaults.
 *
@@ -86,12 +91,16 @@ function resolveOptions(options = {}) {
 		cwd: options.cwd ?? DEFAULT_OPTIONS.cwd,
 		newlineBetween: options.newlineBetween ?? DEFAULT_OPTIONS.newlineBetween,
 		sortKeys: options.sortKeys ?? DEFAULT_OPTIONS.sortKeys,
-		strategy: options.strategy ?? DEFAULT_OPTIONS.strategy,
+		strategy: resolveStrategy(options.strategy),
 		yarnResolutions: options.yarnResolutions ?? DEFAULT_OPTIONS.yarnResolutions,
 		cleanPackageJson: options.cleanPackageJson ?? DEFAULT_OPTIONS.cleanPackageJson
 	};
 }
-
+function resolveStrategy(strategy) {
+	if (!strategy) return DEFAULT_OPTIONS.strategy;
+	if (VALID_STRATEGIES.includes(strategy)) return strategy;
+	throw new Error(`Invalid strategy: ${strategy}. Expected one of: ${VALID_STRATEGIES.join(", ")}`);
+}
 //#endregion
 //#region src/utils/fs.ts
 /**
@@ -118,17 +127,88 @@ async function fsReadFile(path) {
 async function fsWriteFile(path, content) {
 	await writeFile(path, `${content.trimEnd()}\n`, "utf-8");
 }
-
-//#endregion
-//#region src/utils/color.ts
-const cyan = getColor("cyan");
-const yellow = getColor("yellow");
+getColor("cyan");
+getColor("yellow");
 const dim = getColor("dim");
-const green = getColor("green");
-const red = getColor("red");
-const bold = getColor("bold");
-const magenta = getColor("magenta");
-
+getColor("green");
+getColor("red");
+getColor("bold");
+getColor("magenta");
+//#endregion
+//#region src/utils/merge.ts
+/**
+* Merge two objects based on the specified strategy.
+*
+* @param existing - Existing pnpm-workspace.yaml content
+* @param incoming - New settings from package.json and .npmrc
+* @param strategy - Merge strategy to use
+*
+* @returns Merged pnpm workspace configuration
+*
+* @example
+* ```ts
+* // Discard strategy - keep existing values
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'discard')
+* // => { packages: ['a'] }
+*
+* // Merge strategy - combine arrays with deduplication
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'merge')
+* // => { packages: ['a', 'b'] }
+*
+* // Overwrite strategy - use incoming values
+* mergeByStrategy({ packages: ['a'] }, { packages: ['b'] }, 'overwrite')
+* // => { packages: ['b'] }
+* ```
+*/
+function mergeByStrategy(existing, incoming, strategy) {
+	switch (strategy) {
+		case "discard": return discardMerge(existing, incoming);
+		case "merge": return mergeWithArrayDedupe(existing, incoming);
+		case "overwrite": return discardMerge(incoming, existing);
+		default: return defu(existing, incoming);
+	}
+}
+/**
+* Merge objects with priority to the first argument.
+* Only adds keys from second argument that don't exist in first.
+* For nested objects, recursively merges them.
+*
+* @param priority - Object with priority values
+* @param fallback - Object with fallback values
+*
+* @returns Merged result
+*/
+function discardMerge(priority, fallback) {
+	const result = { ...priority };
+	for (const [key, fallbackValue] of Object.entries(fallback)) {
+		const priorityValue = result[key];
+		if (isUndefined(priorityValue)) result[key] = fallbackValue;
+		else if (isPlainObject(priorityValue) && isPlainObject(fallbackValue)) result[key] = discardMerge(priorityValue, fallbackValue);
+	}
+	return result;
+}
+/**
+* Deep merge two objects with array deduplication.
+*
+* For arrays, this function takes the union of both arrays and removes duplicates.
+* For objects, it recursively merges them.
+* For primitives, it prefers existing values.
+*
+* @param existing - Existing values
+* @param incoming - New values
+*
+* @returns Merged result with deduplicated arrays
+*/
+function mergeWithArrayDedupe(existing, incoming) {
+	const result = { ...existing };
+	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 (isPlainObject(existingValue) && isPlainObject(incomingValue)) result[key] = mergeWithArrayDedupe(existingValue, incomingValue);
+	}
+	return result;
+}
 //#endregion
 //#region src/utils/npmrc.ts
 /**
@@ -175,7 +255,6 @@ async function pruneNpmrc(path) {
 async function readNpmrc(path) {
 	return camelcaseKeys(await readIniFile(path));
 }
-
 //#endregion
 //#region src/core.ts
 /**
@@ -229,9 +308,9 @@ async function migratePnpmSettings(rawOptions = {}) {
 			consola.warn("No pnpm settings files to migrate");
 			return;
 		}
-		let packageJsonIndent = DEFAULT_INDENT;
+		let packageJsonIndent = 2;
 		let packageJsonObject = {};
-		let pnpmWorkspaceYamlIndent = DEFAULT_INDENT;
+		let pnpmWorkspaceYamlIndent = 2;
 		let pnpmWorkspaceYamlObject = {};
 		if (packageJsonExists) {
 			const content = await fsReadFile(packageJsonPath);
@@ -256,19 +335,20 @@ async function migratePnpmSettings(rawOptions = {}) {
 			overrides: defu(packageJsonObject.pnpm?.overrides, packageJsonObject.resolutions)
 		} : { ...packageJsonObject.pnpm };
 		if (pnpmSettingsInPackageJson.overrides && !Object.keys(pnpmSettingsInPackageJson.overrides).length) delete pnpmSettingsInPackageJson.overrides;
-		const pnpmWorkspaceResult = defu(pnpmWorkspaceYamlObject, {
+		const incomingSettings = {
 			...pnpmSettingsInNpmrc,
 			...pnpmSettingsInPackageJson
-		});
+		};
+		const pnpmWorkspaceResult = mergeByStrategy(pnpmWorkspaceYamlObject, incomingSettings, options.strategy);
 		const yamlDocument = new Document({}, { sortMapEntries: options.sortKeys });
-		Object.entries(pnpmWorkspaceResult).forEach(([key, value], index) => {
+		Object.entries(pnpmWorkspaceResult).forEach(([key, value]) => {
 			yamlDocument.add({
 				key,
 				value
 			});
-			if (options.newlineBetween && index < Object.keys(pnpmWorkspaceResult).length - 1) {}
 		});
-		await fsWriteFile(pnpmWorkspaceYamlPath, yamlDocument.toString({ indent: pnpmWorkspaceYamlIndent }));
+		const yamlContent = yamlDocument.toString({ indent: pnpmWorkspaceYamlIndent });
+		await fsWriteFile(pnpmWorkspaceYamlPath, options.newlineBetween ? yamlContent.replace(/\n(?=[^\s#][^:\n]*:)/g, "\n\n") : yamlContent);
 		if (npmrcExists && options.cleanNpmrc) await pruneNpmrc(npmrcPath);
 		if (packageJsonExists && options.cleanPackageJson && (packageJsonObject.pnpm || packageJsonObject.resolutions)) {
 			delete packageJsonObject.pnpm;
@@ -280,6 +360,5 @@ async function migratePnpmSettings(rawOptions = {}) {
 		throw err;
 	}
 }
-
 //#endregion
-export { migratePnpmSettings, resolveOptions };
+export { migratePnpmSettings, resolveOptions };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm-settings-migrator",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Move pnpm settings from `pnpm` field in `package.json` and `.npmrc` file to `pnpm-workspace.yaml`",
   "keywords": [
     "migrator",
@@ -37,43 +37,46 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@ntnyq/utils": "^0.9.2",
-    "@pnpm/types": "^1001.2.0",
-    "cac": "^6.7.14",
-    "camelcase-keys": "^10.0.1",
+    "@ntnyq/utils": "^0.11.6",
+    "@pnpm/types": "^1100.0.0",
+    "cac": "^7.0.0",
+    "camelcase-keys": "^10.0.2",
     "consola": "^3.4.2",
-    "defu": "^6.1.4",
+    "defu": "^6.1.7",
     "detect-indent": "^7.0.2",
     "pathe": "^2.0.3",
-    "read-ini-file": "^4.0.0",
+    "read-ini-file": "^5.0.0",
     "uncase": "^0.2.0",
-    "yaml": "^2.8.2"
+    "yaml": "^2.8.3"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^5.8.0",
-    "@ntnyq/prettier-config": "^3.0.1",
-    "@types/node": "^24.10.4",
-    "bumpp": "^10.3.2",
-    "eslint": "^9.39.2",
+    "@ntnyq/eslint-config": "^6.0.1",
+    "@types/node": "^25.6.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260410.1",
+    "bumpp": "^11.0.1",
+    "eslint": "^10.2.0",
     "husky": "^9.1.7",
-    "nano-staged": "^0.9.0",
+    "nano-staged": "^1.0.2",
     "npm-run-all2": "^8.0.4",
-    "prettier": "^3.7.4",
-    "tsdown": "^0.18.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "oxfmt": "^0.44.0",
+    "tsdown": "^0.21.7",
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.4"
   },
   "nano-staged": {
-    "*.{js,ts,mjs,cjs,md,yml,yaml,toml,json}": "eslint --fix"
+    "*.{js,ts,mjs,tsx,md,yml,yaml,toml,json}": "eslint --fix",
+    "*": "oxfmt --no-error-on-unmatched-pattern"
   },
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",
+    "format": "oxfmt",
+    "format:check": "oxfmt --check",
     "lint": "eslint",
     "release": "run-s release:check release:version",
-    "release:check": "run-s lint typecheck test",
+    "release:check": "run-s lint format:check typecheck test",
     "release:version": "bumpp",
     "test": "vitest",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsgo --noEmit"
   }
 }