@pagopa/dx-cli 0.7.0 → 0.8.1

package/bin/index.js

@@ -25,6 +25,7 @@ var LocalCodemodRegistry = class {
 // src/adapters/codemods/update-code-review.ts
 import { getLogger as getLogger2 } from "@logtape/logtape";
 import { replaceInFile } from "replace-in-file";
+import * as YAML2 from "yaml";
 
 // src/adapters/codemods/git.ts
 import { getLogger } from "@logtape/logtape";
@@ -49,20 +50,48 @@ var getLatestCommitShaOrRef = async (owner, repo, ref = "main") => {
   });
 };
 
+// src/adapters/codemods/yaml.ts
+import * as YAML from "yaml";
+var isChildOf = (path2, key) => {
+  const ancestor = path2.at(-1);
+  return YAML.isPair(ancestor) && YAML.isScalar(ancestor.key) && typeof ancestor.key.value === "string" && ancestor.key.value === key;
+};
+
 // src/adapters/codemods/update-code-review.ts
-var updateJSCodeReview = async (sha) => {
+var updateJSCodeReviewJob = (sha) => (workflow, filename) => {
   const logger2 = getLogger2(["dx-cli", "codemod"]);
-  const results = await replaceInFile({
-    allowEmptyPaths: true,
-    files: [".github/workflows/*.yaml"],
-    from: [/pagopa\/dx\/.github\/workflows\/js_code_review.yaml@(\S+)/g],
-    to: [`pagopa/dx/.github/workflows/js_code_review.yaml@${sha}`]
-  });
-  const updated = results.filter((r) => r.hasChanged).map((r) => r.file);
-  updated.forEach((filename) => {
-    logger2.info("Workflow {filename} updated", { filename });
+  const document = YAML2.parseDocument(workflow);
+  let updated = false;
+  YAML2.visit(document, {
+    Map(_, map, path2) {
+      if (map.has("jobs") || isChildOf(path2, "jobs")) {
+        return void 0;
+      }
+      if (map.has("uses")) {
+        const uses = map.get("uses");
+        if (typeof uses === "string" && uses.startsWith("pagopa/dx/.github/workflows/js_code_review.yaml@")) {
+          map.set("secrets", "inherit");
+          map.set("permissions", {
+            contents: "read",
+            "pull-requests": "write"
+          });
+          map.set(
+            "uses",
+            `pagopa/dx/.github/workflows/js_code_review.yaml@${sha}`
+          );
+          updated = true;
+        }
+      }
+      return YAML2.visit.SKIP;
+    }
   });
-  return updated;
+  if (updated) {
+    logger2.info("Workflow {filename} updated", {
+      filename
+    });
+    return YAML2.stringify(document);
+  }
+  return workflow;
 };
 var updateCodeReview = {
   apply: async () => {
@@ -70,13 +99,16 @@ var updateCodeReview = {
     const owner = "pagopa";
     const repo = "dx";
     return getLatestCommitSha(owner, repo).then(async (sha) => {
-      await updateJSCodeReview(sha);
+      await replaceInFile({
+        allowEmptyPaths: true,
+        files: [".github/workflows/*.yaml"],
+        processor: updateJSCodeReviewJob(sha)
+      });
     }).catch(() => {
       logger2.error(
-        "Failed to fetch the latest commit sha from {owner}/{repo}",
+        "Failed to fetch the latest commit sha from {repository}",
         {
-          owner,
-          repo
+          repository: `${owner}/${repo}`
         }
       );
     });
@@ -88,17 +120,13 @@ var updateCodeReview = {
 // src/adapters/codemods/use-azure-appsvc.ts
 import { getLogger as getLogger3 } from "@logtape/logtape";
 import { replaceInFile as replaceInFile2 } from "replace-in-file";
-import YAML from "yaml";
-var isChildOf = (path2, key) => {
-  const ancestor = path2.at(-1);
-  return YAML.isPair(ancestor) && YAML.isScalar(ancestor.key) && typeof ancestor.key.value === "string" && ancestor.key.value === key;
-};
+import YAML3 from "yaml";
 var migrateWorkflow = (sha) => (workflow, filename) => {
   const logger2 = getLogger3(["dx-cli", "codemod"]);
   logger2.debug("Processing {filename} file", { filename });
-  const document = YAML.parseDocument(workflow);
+  const document = YAML3.parseDocument(workflow);
   let updated = false;
-  YAML.visit(document, {
+  YAML3.visit(document, {
     Map(_, map, path2) {
       if (isChildOf(path2, "jobs") || isChildOf(path2, "with")) {
         return void 0;
@@ -113,28 +141,33 @@ var migrateWorkflow = (sha) => (workflow, filename) => {
         )) {
           logger2.debug("Adding disable_auto_staging_deploy");
           map.addIn(["with", "disable_auto_staging_deploy"], true);
+          map.set("permissions", {
+            attestations: "write",
+            contents: "read",
+            "id-token": "write"
+          });
           updated = true;
           return void 0;
         }
       }
-      return YAML.visit.SKIP;
+      return YAML3.visit.SKIP;
     },
     Pair(_, pair) {
-      if (YAML.isScalar(pair.key)) {
+      if (YAML3.isScalar(pair.key)) {
         if (pair.key.value === "function_app_name") {
           updated = true;
           logger2.debug("Updating function_app_name to web_app_name");
-          return new YAML.Pair("web_app_name", pair.value);
+          return new YAML3.Pair("web_app_name", pair.value);
         }
         if (pair.key.value === "use_staging_slot") {
           updated = true;
           logger2.debug("Removing use_staging_slot");
-          return YAML.visit.REMOVE;
+          return YAML3.visit.REMOVE;
         }
         if (pair.key.value === "uses") {
           updated = true;
           logger2.debug("Updating uses value");
-          return new YAML.Pair(
+          return new YAML3.Pair(
             "uses",
             `pagopa/dx/.github/workflows/release-azure-appsvc.yaml@${sha}`
           );
@@ -146,7 +179,7 @@ var migrateWorkflow = (sha) => (workflow, filename) => {
     logger2.info("Workflow {filename} updated", {
       filename
     });
-    return YAML.stringify(document);
+    return YAML3.stringify(document);
   }
   logger2.debug("No changes applied to {filename}", { filename });
   return workflow;
@@ -169,7 +202,48 @@ import { getLogger as getLogger4 } from "@logtape/logtape";
 import { $ } from "execa";
 import * as fs from "fs/promises";
 import { replaceInFile as replaceInFile3 } from "replace-in-file";
-import YAML2 from "yaml";
+import YAML4 from "yaml";
+var NPM = class {
+  lockFileName = "package-lock.json";
+  async listWorkspaces() {
+    const { stdout } = await $`npm query .workspace`;
+    const workspaces = JSON.parse(stdout);
+    const workspaceNames = [];
+    if (Array.isArray(workspaces)) {
+      for (const ws of workspaces) {
+        if (Object.hasOwn(ws, "name")) {
+          workspaceNames.push(ws.name);
+        }
+      }
+    }
+    return workspaceNames;
+  }
+};
+var Yarn = class {
+  lockFileName = "yarn.lock";
+  async listWorkspaces() {
+    const { stdout } = await $({ lines: true })`yarn workspaces list --json`;
+    const workspaceNames = [];
+    for (const line of stdout) {
+      const ws = JSON.parse(line);
+      if (Object.hasOwn(ws, "name")) {
+        workspaceNames.push(ws.name);
+      }
+    }
+    return workspaceNames;
+  }
+};
+async function extractPackageExtensions() {
+  try {
+    const yarnrc = await fs.readFile(".yarnrc.yml", "utf-8");
+    const parsed = YAML4.parse(yarnrc);
+    if (parsed.packageExtensions) {
+      return parsed.packageExtensions;
+    }
+  } catch {
+  }
+  return void 0;
+}
 async function preparePackageJsonForPnpm() {
   const packageJson2 = await fs.readFile("package.json", "utf-8");
   const manifest = JSON.parse(packageJson2);
@@ -196,20 +270,20 @@ async function removeFiles(...files) {
     )
   );
 }
-async function replaceYarnOccurrences() {
+async function replacePMOccurrences() {
   const logger2 = getLogger4(["dx-cli", "codemod"]);
-  logger2.info("Replacing yarn occurrences in files...");
+  logger2.info("Replacing yarn and npm occurrences in files...");
   const results = await replaceInFile3({
     allowEmptyPaths: true,
     files: ["**/*.json", "**/*.md", "**/Dockerfile", "**/docker-compose.yml"],
     from: [
       "https://yarnpkg.com/",
       "https://classic.yarnpkg.com/",
-      /yarn workspace (\S+)/g,
-      /yarn workspace/g,
-      /yarn install --immutable/g,
-      /yarn -q dlx/g,
-      /Yarn/gi
+      /\b(yarn workspace|npm -(\b-workspace\b|\bw\b)) (\S+)\b/g,
+      /\b(yarn workspace|npm -(\b-workspace\b|\bw\b)) /g,
+      /\b(yarn install --immutable|npm ci)\b/g,
+      /\b(yarn -q dlx|npx)\b/g,
+      /\b(Yarn|npm)\b/gi
     ],
     ignore: ["**/node_modules/**", "**/dist/**", "**/build/**"],
     to: [
@@ -232,7 +306,12 @@ async function updateDXWorkflows() {
   const logger2 = getLogger4(["dx-cli", "codemod"]);
   logger2.info("Updating Github Workflows workflows...");
   const sha = await getLatestCommitShaOrRef("pagopa", "dx");
-  const ignore = await updateJSCodeReview(sha);
+  const results = await replaceInFile3({
+    allowEmptyPaths: true,
+    files: [".github/workflows/*.yaml"],
+    processor: updateJSCodeReviewJob(sha)
+  });
+  const ignore = results.filter((r) => !r.hasChanged).map((r) => r.file);
   await replaceInFile3({
     allowEmptyPaths: true,
     files: [".github/workflows/*.yaml"],
@@ -240,26 +319,42 @@ async function updateDXWorkflows() {
     processor: migrateWorkflow(sha)
   });
 }
-async function writePnpmWorkspaceFile(workspaces) {
+async function writePnpmWorkspaceFile(workspaces, packageExtensions) {
   const pnpmWorkspace = {
+    packageExtensions,
     packages: workspaces.length > 0 ? workspaces : ["apps/*", "packages/*"]
   };
-  const yamlContent = YAML2.stringify(pnpmWorkspace);
+  const yamlContent = YAML4.stringify(pnpmWorkspace);
   await fs.writeFile("pnpm-workspace.yaml", yamlContent, "utf-8");
 }
 var apply = async (info) => {
   if (info.packageManager === "pnpm") {
     throw new Error("Project is already using pnpm");
   }
+  const pm = info.packageManager === "yarn" ? new Yarn() : new NPM();
   const logger2 = getLogger4(["dx-cli", "codemod"]);
+  const localWorkspaces = await pm.listWorkspaces();
+  logger2.info("Using the {protocol} protocol for local dependencies", {
+    protocol: "workspace:"
+  });
+  if (localWorkspaces.length > 0) {
+    await replaceInFile3({
+      allowEmptyPaths: true,
+      files: ["**/package.json"],
+      from: localWorkspaces.map((ws) => new RegExp(`"${ws}": ".*?"`, "g")),
+      to: localWorkspaces.map((ws) => `"${ws}": "workspace:^"`)
+    });
+  }
   logger2.info("Remove unused fields from {file}", {
     file: "package.json"
   });
   const workspaces = await preparePackageJsonForPnpm();
+  const packageExtensions = info.packageManager === "yarn" ? await extractPackageExtensions() : void 0;
   logger2.info("Create {file}", {
     file: "pnpm-workspace.yaml"
   });
-  await writePnpmWorkspaceFile(workspaces);
+  await writePnpmWorkspaceFile(workspaces, packageExtensions);
+  await $`corepack pnpm@latest add --config pnpm-plugin-pagopa`;
   logger2.info("Remove node_modules and yarn files");
   await removeFiles(
     ".yarnrc",
@@ -270,26 +365,29 @@ var apply = async (info) => {
     ".pnp.loader.cjs",
     "node_modules"
   );
-  logger2.info("Importing {source} to {target}", {
-    source: "yarn.lock",
-    target: "pnpm-lock.yaml"
-  });
-  try {
-    await fs.access("yarn.lock");
-    await $`corepack pnpm@latest import yarn.lock`;
-    await removeFiles("yarn.lock");
-  } catch {
-    logger2.info("No yarn.lock file found, skipping import.");
+  const stat2 = await fs.stat(pm.lockFileName);
+  if (stat2.isFile()) {
+    logger2.info("Importing {source} to {target}", {
+      source: pm.lockFileName,
+      target: "pnpm-lock.yaml"
+    });
+    await $`corepack pnpm@latest import ${pm.lockFileName}`;
+    await removeFiles(pm.lockFileName);
+  } else {
+    logger2.info("No {source} file found, skipping import.", {
+      source: pm.lockFileName
+    });
   }
-  await $`corepack pnpm@latest add --config pnpm-plugin-pagopa`;
-  await replaceYarnOccurrences();
+  await replacePMOccurrences();
   await updateDXWorkflows();
+  logger2.info("Adding pnpm store to .gitignore...");
+  await fs.appendFile(".gitignore", "\n\n# PNPM\n.pnpm-store");
   logger2.info("Setting pnpm as the package manager...");
   await $`corepack use pnpm@latest`;
 };
 var use_pnpm_default = {
   apply,
-  description: "A codemod that switches the project to use pnpm",
+  description: "Migrate the project to use pnpm as the package manager",
   id: "use-pnpm"
 };
 
@@ -665,7 +763,7 @@ import { Command as Command5 } from "commander";
 import { getLogger as getLogger7 } from "@logtape/logtape";
 function printVersion() {
   const logger2 = getLogger7(["dx-cli", "version"]);
-  logger2.info(`dx CLI version: ${"0.7.0"}`);
+  logger2.info(`dx CLI version: ${"0.8.1"}`);
 }
 
 // src/adapters/commander/commands/version.ts
@@ -674,11 +772,9 @@ var makeVersionCommand = () => new Command5().name("version").alias("v").action(
 // 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.7.0");
+  program2.name("dx").description("The CLI for DX-Platform").version("0.8.1");
   program2.addCommand(makeDoctorCommand(deps2, config2));
-  if (process.env.ENABLE_CODEMODS) {
-    program2.addCommand(makeCodemodCommand(cliDeps));
-  }
+  program2.addCommand(makeCodemodCommand(cliDeps));
   if (process.env.ENABLE_INIT_COMMAND) {
     program2.addCommand(makeInitCommand());
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-cli",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "type": "module",
   "description": "A CLI useful to manage DX tools.",
   "repository": {
@@ -31,7 +31,7 @@
     "semver": "^7.7.2",
     "yaml": "^2.8.0",
     "zod": "^3.25.28",
-    "@pagopa/monorepo-generator": "^0.6.0"
+    "@pagopa/monorepo-generator": "^0.8.0"
   },
   "devDependencies": {
     "@tsconfig/node22": "22.0.2",