@pagopa/dx-cli 0.14.3 → 0.14.5

package/README.md

@@ -122,10 +122,13 @@ This command will:
 
 - Check that required tools (e.g., Terraform CLI) are installed
 - Interactively prompt for project metadata (cloud provider, region, environments, cost center, etc.)
+- **Check that the target GitHub repository does not already exist before proceeding**
 - Generate a monorepo structure following PagoPA DevEx guidelines
 - Create a remote GitHub repository using Terraform
 - Push the initial codebase to the newly created repository
 
+If the specified GitHub repository already exists, the command will fail early with a clear error message, preventing accidental overwrites.
+
 **Example usage:**
 
 ```bash

package/bin/index.js

@@ -3,7 +3,7 @@
 // src/index.ts
 import "core-js/actual/set/index.js";
 import { configure, getConsoleSink } from "@logtape/logtape";
-import { Octokit as Octokit2 } from "octokit";
+import { Octokit as Octokit3 } from "octokit";
 
 // src/adapters/codemods/registry.ts
 import { okAsync } from "neverthrow";
@@ -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",
@@ -757,10 +765,38 @@ import loadMonorepoScaffolder, {
 import chalk from "chalk";
 import { Command as Command4 } from "commander";
 import { $ as $3 } from "execa";
-import { okAsync as okAsync2, ResultAsync as ResultAsync6 } from "neverthrow";
+import { errAsync, okAsync as okAsync2, ResultAsync as ResultAsync6 } from "neverthrow";
 import * as path from "path";
 import { oraPromise } from "ora";
 
+// src/domain/github.ts
+var PullRequest = class {
+  constructor(url) {
+    this.url = url;
+  }
+};
+var Repository = class {
+  constructor(name, owner) {
+    this.name = name;
+    this.owner = owner;
+  }
+  get fullName() {
+    return `${this.owner}/${this.name}`;
+  }
+  get ssh() {
+    return `git@github.com:${this.owner}/${this.name}.git`;
+  }
+  get url() {
+    return `https://github.com/${this.owner}/${this.name}`;
+  }
+};
+var RepositoryNotFoundError = class extends Error {
+  constructor(owner, name) {
+    super(`Repository ${owner}/${name} not found`);
+    this.name = "RepositoryNotFoundError";
+  }
+};
+
 // src/adapters/execa/terraform.ts
 import { $ as $2 } from "execa";
 var tf$ = $2({
@@ -796,18 +832,6 @@ var decode = (schema) => (data) => ResultAsync5.fromPromise(
 );
 
 // src/adapters/commander/commands/init.ts
-var Repository = class {
-  constructor(name, owner) {
-    this.name = name;
-    this.owner = owner;
-  }
-  get ssh() {
-    return `git@github.com:${this.owner}/${this.name}.git`;
-  }
-  get url() {
-    return `https://github.com/${this.owner}/${this.name}`;
-  }
-};
 var withSpinner = (text, successText, failText, promise) => ResultAsync6.fromPromise(
   oraPromise(promise, {
     failText,
@@ -819,7 +843,20 @@ var withSpinner = (text, successText, failText, promise) => ResultAsync6.fromPro
     return new Error(failText, { cause });
   }
 );
-var validateAnswers = (answers) => okAsync2(answers);
+var validateAnswers = (githubService) => (answers) => ResultAsync6.fromPromise(
+  githubService.getRepository(answers.repoOwner, answers.repoName),
+  (error) => error
+).andThen(
+  ({ fullName }) => errAsync(new Error(`Repository ${fullName} already exists.`))
+).orElse(
+  (error) => error instanceof RepositoryNotFoundError ? (
+    // If repository is not found, it's safe to proceed
+    okAsync2(answers)
+  ) : (
+    // Otherwise, propagate the error
+    errAsync(error)
+  )
+).map(() => answers);
 var runGeneratorActions = (generator) => (answers) => withSpinner(
   "Creating workspace files...",
   "Workspace files created successfully!",
@@ -911,8 +948,8 @@ var initializeGitRepository = (repository) => {
     pushToOrigin()
   ).map(() => ({ branchName, repository }));
 };
-var handleNewGitHubRepository = (octokit2) => (answers) => createRemoteRepository(answers).andThen(initializeGitRepository).andThen(
-  (localWorkspace) => createPullRequest(octokit2)(localWorkspace).map((pr) => ({
+var handleNewGitHubRepository = (githubService) => (answers) => createRemoteRepository(answers).andThen(initializeGitRepository).andThen(
+  (localWorkspace) => createPullRequest(githubService)(localWorkspace).map((pr) => ({
     pr,
     repository: localWorkspace.repository
   }))
@@ -928,14 +965,14 @@ var makeInitResult = (answers, { pr, repository }) => {
     repository
   };
 };
-var createPullRequest = (octokit2) => ({
+var createPullRequest = (githubService) => ({
   branchName,
   repository
 }) => withSpinner(
   "Creating Pull Request...",
   "Pull Request created successfully!",
   "Failed to create Pull Request.",
-  octokit2.rest.pulls.create({
+  githubService.createPullRequest({
     base: "main",
     body: "This PR contains the scaffolded monorepo structure.",
     head: branchName,
@@ -943,9 +980,9 @@ var createPullRequest = (octokit2) => ({
     repo: repository.name,
     title: "Scaffold repository"
   })
-).map(({ data }) => ({ url: data.html_url })).orElse(() => okAsync2(void 0));
+).orElse(() => okAsync2(void 0));
 var makeInitCommand = ({
-  octokit: octokit2
+  gitHubService: gitHubService2
 }) => new Command4().name("init").description(
   "Command to initialize resources (like projects, subscriptions, ...)"
 ).addCommand(
@@ -953,10 +990,10 @@ var makeInitCommand = ({
     await checkPreconditions().andThen(initPlop).andTee(loadMonorepoScaffolder).andThen((plop) => getGenerator(plop)(PLOP_MONOREPO_GENERATOR_NAME)).andThen(
       (generator) => (
         // Ask the user the questions defined in the plop generator
-        getPrompts(generator).andThen(decode(answersSchema)).andThen(validateAnswers).andThen(runGeneratorActions(generator))
+        getPrompts(generator).andThen(decode(answersSchema)).andThen(validateAnswers(gitHubService2)).andThen(runGeneratorActions(generator))
       )
     ).andThen(
-      (answers) => handleNewGitHubRepository(octokit2)(answers).map(
+      (answers) => handleNewGitHubRepository(gitHubService2)(answers).map(
         (repoPr) => makeInitResult(answers, repoPr)
       )
     ).match(displaySummary, exitWithError(this));
@@ -996,7 +1033,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.3");
+  program2.name("dx").description("The CLI for DX-Platform").version("0.14.5");
   program2.addCommand(makeDoctorCommand(deps2, config2));
   program2.addCommand(makeCodemodCommand(cliDeps));
   program2.addCommand(makeInitCommand(deps2));
@@ -1039,11 +1076,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.`)
@@ -1109,7 +1146,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(
@@ -1141,9 +1178,54 @@ var makeRepositoryReader = () => ({
   fileExists,
   findRepositoryRoot,
   getWorkspaces,
-  readFile: readFile2
+  readFile
 });
 
+// src/adapters/octokit/index.ts
+import { RequestError } from "octokit";
+var OctokitGitHubService = class {
+  #octokit;
+  constructor(octokit2) {
+    this.#octokit = octokit2;
+  }
+  async createPullRequest(params) {
+    try {
+      const { data } = await this.#octokit.rest.pulls.create({
+        base: params.base,
+        body: params.body,
+        head: params.head,
+        owner: params.owner,
+        repo: params.repo,
+        title: params.title
+      });
+      return new PullRequest(data.html_url);
+    } catch (error) {
+      throw new Error(
+        `Failed to create pull request in ${params.owner}/${params.repo}`,
+        {
+          cause: error
+        }
+      );
+    }
+  }
+  async getRepository(owner, name) {
+    try {
+      const { data } = await this.#octokit.rest.repos.get({
+        owner,
+        repo: name
+      });
+      return new Repository(data.name, data.owner.login);
+    } catch (error) {
+      if (error instanceof RequestError && error.status === 404) {
+        throw new RepositoryNotFoundError(owner, name);
+      }
+      throw new Error(`Failed to fetch repository ${owner}/${name}`, {
+        cause: error
+      });
+    }
+  }
+};
+
 // src/config.ts
 var getConfig = () => ({
   minVersions: {
@@ -1152,9 +1234,9 @@ var getConfig = () => ({
 });
 
 // src/use-cases/apply-codemod.ts
-import { errAsync, okAsync as okAsync4, ResultAsync as ResultAsync9 } from "neverthrow";
+import { errAsync as errAsync2, okAsync as okAsync4, ResultAsync as ResultAsync9 } from "neverthrow";
 var getCodemodById = (registry2, id) => registry2.getById(id).andThen(
-  (codemod) => codemod ? okAsync4(codemod) : errAsync(new Error(`Codemod with id ${id} not found`))
+  (codemod) => codemod ? okAsync4(codemod) : errAsync2(new Error(`Codemod with id ${id} not found`))
 );
 var safeGetInfo = (getInfo2) => ResultAsync9.fromPromise(
   getInfo2(),
@@ -1195,11 +1277,12 @@ await configure({
 var repositoryReader = makeRepositoryReader();
 var packageJsonReader = makePackageJsonReader();
 var validationReporter = makeValidationReporter();
-var octokit = new Octokit2({
+var octokit = new Octokit3({
   auth: process.env.GITHUB_TOKEN
 });
+var gitHubService = new OctokitGitHubService(octokit);
 var deps = {
-  octokit,
+  gitHubService,
   packageJsonReader,
   repositoryReader,
   validationReporter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-cli",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "type": "module",
   "description": "A CLI useful to manage DX tools.",
   "repository": {