@pagopa/dx-cli 0.14.2 → 0.14.4

package/bin/index.js

@@ -201,7 +201,8 @@ var useAzureAppsvc = {
 // src/adapters/codemods/use-pnpm.ts
 import { getLogger as getLogger4 } from "@logtape/logtape";
 import { $ } from "execa";
-import * as fs from "fs/promises";
+import assert from "assert/strict";
+import fs from "fs/promises";
 import { replaceInFile as replaceInFile3 } from "replace-in-file";
 import semver from "semver";
 import YAML4 from "yaml";
@@ -262,6 +263,17 @@ async function preparePackageJsonForPnpm() {
   await fs.writeFile("package.json", JSON.stringify(manifest, null, 2));
   return workspaces;
 }
+async function writePnpmWorkspaceFile(workspaces, packageExtensions) {
+  const pnpmWorkspace = {
+    cleanupUnusedCatalogs: true,
+    linkWorkspacePackages: true,
+    packageExtensions,
+    packageImportMethod: "clone-or-copy",
+    packages: workspaces.length > 0 ? workspaces : ["apps/*", "packages/*"]
+  };
+  const yamlContent = YAML4.stringify(pnpmWorkspace);
+  await fs.writeFile("pnpm-workspace.yaml", yamlContent, "utf-8");
+}
 async function removeFiles(...files) {
   await Promise.all(
     files.map(
@@ -285,7 +297,7 @@ async function replacePMOccurrences() {
       /\b(yarn workspace|npm -(\b-workspace\b|\bw\b))\b/g,
       /\b(yarn install --immutable|npm ci)\b/g,
       /\b(yarn -q dlx|npx)\b/g,
-      /\b(Yarn|npm)\b/gi
+      /(^|\s)(Yarn|npm)(?!\S)/gi
     ],
     ignore: ["**/node_modules/**", "**/dist/**", "**/build/**"],
     to: [
@@ -321,33 +333,20 @@ async function updateDXWorkflows() {
     processor: migrateWorkflow(sha)
   });
 }
-async function writePnpmWorkspaceFile(workspaces, packageExtensions) {
-  const pnpmWorkspace = {
-    packageExtensions,
-    packages: workspaces.length > 0 ? workspaces : ["apps/*", "packages/*"]
-  };
-  const yamlContent = YAML4.stringify(pnpmWorkspace);
-  await fs.writeFile("pnpm-workspace.yaml", yamlContent, "utf-8");
-}
-var apply = async (info) => {
+var usePnpm = async (packageManager, currentNodeVersion) => {
   const minNodeVersion = "20.19.5";
-  const currentNodeVersion = process.versions.node;
-  if (!semver.gte(currentNodeVersion, minNodeVersion)) {
-    console.error(
-      `This codemod requires Node.js >= ${minNodeVersion}. Current version: ${currentNodeVersion}`
-    );
-    process.exit(1);
-  }
-  if (info.packageManager === "pnpm") {
-    throw new Error("Project is already using pnpm");
-  }
-  const pm = info.packageManager === "yarn" ? new Yarn() : new NPM();
+  assert.notEqual(packageManager, "pnpm", "Project is already using pnpm");
+  assert.ok(
+    semver.gte(currentNodeVersion, minNodeVersion),
+    `his codemod requires Node.js >= ${minNodeVersion}. Current version: ${currentNodeVersion}`
+  );
   const logger = getLogger4(["dx-cli", "codemod"]);
+  const pm = packageManager === "yarn" ? new Yarn() : new NPM();
   const localWorkspaces = await pm.listWorkspaces();
-  logger.info("Using the {protocol} protocol for local dependencies", {
-    protocol: "workspace:"
-  });
   if (localWorkspaces.length > 0) {
+    logger.info("Using the {protocol} protocol for local dependencies", {
+      protocol: "workspace:"
+    });
     await replaceInFile3({
       allowEmptyPaths: true,
       files: ["**/package.json"],
@@ -359,12 +358,11 @@ var apply = async (info) => {
     file: "package.json"
   });
   const workspaces = await preparePackageJsonForPnpm();
-  const packageExtensions = info.packageManager === "yarn" ? await extractPackageExtensions() : void 0;
+  const packageExtensions = packageManager === "yarn" ? await extractPackageExtensions() : void 0;
   logger.info("Create {file}", {
     file: "pnpm-workspace.yaml"
   });
   await writePnpmWorkspaceFile(workspaces, packageExtensions);
-  await $`corepack pnpm@latest add --config pnpm-plugin-pagopa`;
   logger.info("Remove node_modules and yarn files");
   await removeFiles(
     ".yarnrc",
@@ -375,8 +373,8 @@ var apply = async (info) => {
     ".pnp.loader.cjs",
     "node_modules"
   );
-  const stat2 = await fs.stat(pm.lockFileName);
-  if (stat2.isFile()) {
+  const stat = await fs.stat(pm.lockFileName);
+  if (stat.isFile()) {
     logger.info("Importing {source} to {target}", {
       source: pm.lockFileName,
       target: "pnpm-lock.yaml"
@@ -395,6 +393,16 @@ var apply = async (info) => {
   logger.info("Setting pnpm as the package manager...");
   await $`corepack use pnpm@latest`;
 };
+var apply = async (info) => {
+  const logger = getLogger4(["dx-cli", "codemod"]);
+  try {
+    await usePnpm(info.packageManager, process.versions.node);
+  } catch (error) {
+    if (error instanceof Error) {
+      logger.error(error.message);
+    }
+  }
+};
 var use_pnpm_default = {
   apply,
   description: "Migrate the project to use pnpm as the package manager",
@@ -814,7 +822,10 @@ var withSpinner = (text, successText, failText, promise) => ResultAsync6.fromPro
     successText,
     text
   }),
-  (cause) => new Error(failText, { cause })
+  (cause) => {
+    console.error(`Something went wrong: ${JSON.stringify(cause, null, 2)}`);
+    return new Error(failText, { cause });
+  }
 );
 var validateAnswers = (answers) => okAsync2(answers);
 var runGeneratorActions = (generator) => (answers) => withSpinner(
@@ -993,7 +1004,7 @@ var makeSavemoneyCommand = () => new Command5("savemoney").description(
 // src/adapters/commander/index.ts
 var makeCli = (deps2, config2, cliDeps) => {
   const program2 = new Command6();
-  program2.name("dx").description("The CLI for DX-Platform").version("0.14.2");
+  program2.name("dx").description("The CLI for DX-Platform").version("0.14.4");
   program2.addCommand(makeDoctorCommand(deps2, config2));
   program2.addCommand(makeCodemodCommand(cliDeps));
   program2.addCommand(makeInitCommand(deps2));
@@ -1036,11 +1047,11 @@ var parseJson = Result2.fromThrowable(
 );
 
 // src/adapters/node/fs/file-reader.ts
-var readFile2 = (filePath) => ResultAsync7.fromPromise(
+var readFile = (filePath) => ResultAsync7.fromPromise(
   fs3.readFile(filePath, "utf-8"),
   (cause) => new Error(`Failed to read file: ${filePath}`, { cause })
 );
-var readFileAndDecode = (filePath, schema) => readFile2(filePath).andThen(parseJson).andThen(decode(schema));
+var readFileAndDecode = (filePath, schema) => readFile(filePath).andThen(parseJson).andThen(decode(schema));
 var fileExists = (path3) => ResultAsync7.fromPromise(
   fs3.stat(path3),
   () => new Error(`${path3} not found.`)
@@ -1106,7 +1117,7 @@ var resolveWorkspacePattern = (repoRoot, pattern) => ResultAsync8.fromPromise(
     subDirectories.map((directory) => path2.join(repoRoot, directory))
   )
 );
-var getWorkspaces = (repoRoot) => readFile2(path2.join(repoRoot, "pnpm-workspace.yaml")).andThen(parseYaml).andThen(
+var getWorkspaces = (repoRoot) => readFile(path2.join(repoRoot, "pnpm-workspace.yaml")).andThen(parseYaml).andThen(
   (obj) => (
     // If no packages are defined, go on with an empty array
     decode(z3.object({ packages: z3.array(z3.string()) }))(obj).orElse(
@@ -1138,7 +1149,7 @@ var makeRepositoryReader = () => ({
   fileExists,
   findRepositoryRoot,
   getWorkspaces,
-  readFile: readFile2
+  readFile
 });
 
 // src/config.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-cli",
-  "version": "0.14.2",
+  "version": "0.14.4",
   "type": "module",
   "description": "A CLI useful to manage DX tools.",
   "repository": {
@@ -33,8 +33,8 @@
     "semver": "^7.7.2",
     "yaml": "^2.8.2",
     "zod": "^4.2.1",
-    "@pagopa/dx-savemoney": "^0.1.4",
-    "@pagopa/monorepo-generator": "^0.14.1"
+    "@pagopa/monorepo-generator": "^0.14.1",
+    "@pagopa/dx-savemoney": "^0.1.4"
   },
   "devDependencies": {
     "@tsconfig/node22": "22.0.2",