pnpm-settings-migrator 0.0.1 → 0.0.2

package/README.md

@@ -17,9 +17,26 @@ pnpm dlx pnpm-settings-migrator
 
 ## CLI Options
 
-| Option |   Type   |     Default     |        Description        |
-| :----: | :------: | :-------------: | :-----------------------: |
-| `cwd`  | `string` | `process.cwd()` | Current working directory |
+### `--cwd`
+
+- **Type**: `string`
+- **Default**: `process.cwd()`
+
+Current working directory.
+
+### `--no-clean-npmrc`
+
+- **Type**: `boolean`
+- **Default**: `false`
+
+Disable removing pnpm settings in `.npmrc` file.
+
+### `---no-clean-package-json`
+
+- **Type**: `boolean`
+- **Default**: `false`
+
+Disable removing `pnpm` field in `package.json`.
 
 ## Context
 

package/dist/cli.mjs

@@ -2,16 +2,18 @@ import process from 'node:process';
 import { cac } from 'cac';
 import { consola } from 'consola';
 import { getColor } from 'consola/utils';
-import { m as migratePnpmSettings } from './shared/pnpm-settings-migrator.BiiS7DGq.mjs';
+import { m as migratePnpmSettings } from './shared/pnpm-settings-migrator.UmbLs3tK.mjs';
 import '@ntnyq/utils';
 import 'pathe';
 import 'node:fs/promises';
+import 'detect-indent';
 import 'js-yaml';
 import 'camelcase-keys';
 import 'read-ini-file';
+import 'uncase';
 
 const name = "pnpm-settings-migrator";
-const version = "0.0.1";
+const version = "0.0.2";
 
 const dim = getColor("dim");
 const green = getColor("green");
@@ -19,7 +21,10 @@ const red = getColor("red");
 const bold = getColor("bold");
 const magenta = getColor("magenta");
 const cli = cac(name);
-cli.version(version).option("--cwd [cwd]", "Current working directory").help();
+cli.version(version).option("--cwd [cwd]", "Current working directory").option("--no-clean-npmrc", "Disable removing pnpm settings in .npmrc file").option(
+  "--no-clean-package-json",
+  "Disable removing pnpm field in package.json"
+).help();
 cli.command("").action(async (options) => {
   try {
     consola.log(`

package/dist/index.d.mts

@@ -1,6 +1,8 @@
+import { PnpmSettings } from '@pnpm/types';
+
 interface Options {
     /**
-     * Whether to remove `.npmrc` file
+     * Whether to remove pnpm settings in `.npmrc` file
      *
      * @default true
      */
@@ -26,4 +28,30 @@ declare function resolveOptions(options?: Options): Required<Options>;
 
 declare function migratePnpmSettings(rawOptions?: Options): Promise<void>;
 
-export { type Options, migratePnpmSettings, resolveOptions };
+/**
+ * legacy `pnpm-workspace` types
+ */
+type PnpmWorkspaceLegacy = {
+    catalog?: Record<string, string>;
+    catalogs?: Record<string, Record<string, string>>;
+    packages?: string[];
+};
+/**
+ * `package-json`
+ * @pg
+ */
+interface PackageJson {
+    pnpm?: PnpmSettings;
+}
+/**
+ * `.npmrc`
+ * @pg
+ */
+type NpmRC = Record<string, any>;
+/**
+ * `pnpm-workspace` types
+ * @pg
+ */
+type PnpmWorkspace = PnpmSettings & PnpmWorkspaceLegacy;
+
+export { type NpmRC, type Options, type PackageJson, type PnpmWorkspace, type PnpmWorkspaceLegacy, migratePnpmSettings, resolveOptions };

package/dist/index.mjs

@@ -1,8 +1,10 @@
-export { m as migratePnpmSettings, r as resolveOptions } from './shared/pnpm-settings-migrator.BiiS7DGq.mjs';
+export { m as migratePnpmSettings, r as resolveOptions } from './shared/pnpm-settings-migrator.UmbLs3tK.mjs';
 import '@ntnyq/utils';
 import 'pathe';
 import 'node:process';
 import 'node:fs/promises';
+import 'detect-indent';
 import 'js-yaml';
 import 'camelcase-keys';
 import 'read-ini-file';
+import 'uncase';

package/dist/shared/{pnpm-settings-migrator.BiiS7DGq.mjs → pnpm-settings-migrator.UmbLs3tK.mjs}

@@ -2,9 +2,11 @@ import { pick } from '@ntnyq/utils';
 import { resolve } from 'pathe';
 import process from 'node:process';
 import { access, readFile, writeFile } from 'node:fs/promises';
+import detectIndent from 'detect-indent';
 import { load, dump } from 'js-yaml';
 import camelcaseKeys from 'camelcase-keys';
 import { readIniFile } from 'read-ini-file';
+import { kebabCase } from 'uncase';
 
 const NPMRC = ".npmrc";
 const PACKAGE_JSON = "package.json";
@@ -45,14 +47,34 @@ async function fsReadFile(path) {
   return await readFile(path, "utf-8");
 }
 async function fsWriteFile(path, content) {
-  await writeFile(path, content, "utf-8");
+  await writeFile(path, `${content.trimEnd()}
+`, "utf-8");
 }
 
+async function pruneNpmrc(path) {
+  const pnpmSettingsFields = PNPM_SETTINGS_FIELDS.map((v) => kebabCase(v));
+  const content = await fsReadFile(path);
+  const lines = content.split(/\r?\n/).filter((line) => {
+    const trimedLine = line.trim();
+    if (!trimedLine.length || pnpmSettingsFields.some((v) => trimedLine.startsWith(v))) {
+      return false;
+    }
+    return true;
+  });
+  await fsWriteFile(path, lines.join("\n"));
+}
 async function readNpmrc(path) {
   const content = await readIniFile(path);
   return camelcaseKeys(content);
 }
 
+async function prunePackageJson(path) {
+  const content = await fsReadFile(path);
+  const indent = detectIndent(content);
+  const packageJson = JSON.parse(content);
+  delete packageJson.pnpm;
+  await fsWriteFile(path, JSON.stringify(packageJson, null, indent.indent || 2));
+}
 async function readPackageJson(path) {
   const content = await fsReadFile(path);
   return JSON.parse(content);
@@ -63,7 +85,9 @@ async function readPnpmWorkspace(path) {
   return load(content);
 }
 async function writePnpmWorkspace(path, pnpmWorkspace) {
-  await fsWriteFile(path, dump(pnpmWorkspace));
+  const content = await fsReadFile(path);
+  const indent = detectIndent(content);
+  await fsWriteFile(path, dump(pnpmWorkspace, { indent: indent.amount || 2 }));
 }
 
 async function migratePnpmSettings(rawOptions = {}) {
@@ -80,6 +104,12 @@ async function migratePnpmSettings(rawOptions = {}) {
     ...isPnpmWorkspaceExist ? await readPnpmWorkspace(pnpmWorkspaceYamlPath) : {}
   };
   await writePnpmWorkspace(pnpmWorkspaceYamlPath, pnpmWorkspaceContent);
+  if (isNpmrcExist && options.cleanNpmrc) {
+    await pruneNpmrc(npmrcPath);
+  }
+  if (isPackageJsonExist && options.cleanNpmrc) {
+    await prunePackageJson(packageJsonPath);
+  }
 }
 
 export { migratePnpmSettings as m, resolveOptions as r };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm-settings-migrator",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Move pnpm settings from `pnpm` field in `package.json` and `.npmrc` file to `pnpm-workspace.yaml`",
   "keywords": [
     "migrator",
@@ -42,9 +42,11 @@
     "cac": "^6.7.14",
     "camelcase-keys": "^9.1.3",
     "consola": "^3.4.0",
+    "detect-indent": "^7.0.1",
     "js-yaml": "^4.1.0",
     "pathe": "^2.0.3",
-    "read-ini-file": "^4.0.0"
+    "read-ini-file": "^4.0.0",
+    "uncase": "^0.0.4"
   },
   "devDependencies": {
     "@ntnyq/eslint-config": "^4.0.0-beta.11",