@solvro/config 2.1.1 → 2.2.0

package/dist/cli/index.js

@@ -1,13 +1,13 @@
 // src/cli/index.ts
-import * as p6 from "@clack/prompts";
+import * as p8 from "@clack/prompts";
 import { Command } from "commander";
 import { getUserAgent } from "package-manager-detector/detect";
-import c from "picocolors";
+import c2 from "picocolors";
 
 // package.json
 var package_default = {
   name: "@solvro/config",
-  version: "2.1.0",
+  version: "2.1.1",
   description: "Solvro's engineering style guide",
   keywords: [
     "eslint",
@@ -142,6 +142,44 @@ var package_default = {
   }
 };
 
+// src/constants/index.ts
+var REPO_URL = "https://github.com/Solvro/lib-web-solvro-config";
+var BUG_TRACKER_URL = `${REPO_URL}/issues/new`;
+
+// src/utils/confirm-project-type.ts
+import * as p2 from "@clack/prompts";
+
+// src/utils/polish-confirm.ts
+import * as p from "@clack/prompts";
+import isInteractive from "is-interactive";
+var polishConfirm = async (props) => {
+  if (!isInteractive()) {
+    return true;
+  }
+  return p.confirm({
+    active: "Tak",
+    inactive: "Nie",
+    ...props
+  });
+};
+
+// src/utils/confirm-project-type.ts
+var confirmProjectType = async (projectType) => {
+  const isConfirmed = await polishConfirm({
+    message: `Wygl\u0105da jakby\u015B u\u017Cywa\u0142 ${projectType}'a. Czy to si\u0119 zgadza?`
+  });
+  if (p2.isCancel(isConfirmed)) {
+    p2.cancel("\u{1F621}");
+    process.exit(1);
+  }
+  if (!isConfirmed) {
+    p2.cancel(
+      `:( Zg\u0142o\u015B b\u0142\u0105d na GitHubie, a my spr\xF3bujemy pom\xF3c: ${BUG_TRACKER_URL}`
+    );
+    process.exit(1);
+  }
+};
+
 // src/utils/is-git-clean.ts
 import { execSync } from "child_process";
 function isGitClean() {
@@ -154,11 +192,12 @@ function isGitClean() {
 }
 
 // src/utils/package-json.ts
-import * as p from "@clack/prompts";
+import * as p4 from "@clack/prompts";
 import { getPackageInfo, isPackageListed, loadPackageJSON } from "local-pkg";
 import assert from "assert";
 import { writeFile } from "fs/promises";
 import path2 from "path";
+import c from "picocolors";
 import semver from "semver";
 
 // src/utils/git-root.ts
@@ -195,23 +234,45 @@ var $$ = (async (...arguments_) => {
   return cachedExeca(...arguments_);
 });
 
+// src/utils/run-with-spinner.ts
+import * as p3 from "@clack/prompts";
+
 // src/utils/run-if-interactive.ts
-import isInteractive from "is-interactive";
+import isInteractive2 from "is-interactive";
 var runIfInteractive = (function_) => {
-  if (isInteractive()) {
+  if (isInteractive2()) {
     return function_();
   }
   return void 0;
 };
 
+// src/utils/run-with-spinner.ts
+var runWithSpinner = async (options2) => {
+  const spinner2 = p3.spinner();
+  runIfInteractive(() => {
+    spinner2.start(options2.start);
+  });
+  try {
+    await options2.callback();
+  } catch (error) {
+    runIfInteractive(() => {
+      spinner2.error(options2.error);
+    });
+    throw error;
+  }
+  runIfInteractive(() => {
+    spinner2.stop(options2.stop);
+  });
+};
+
 // src/utils/package-json.ts
 var PackageJson = class {
   json = null;
   async load() {
     const json = await loadPackageJSON(projectRoot());
     if (json === null) {
-      p.cancel(
-        "Nie znaleziono package.json. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu."
+      p4.cancel(
+        `Nie znaleziono pliku ${c.cyan("package.json")}. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu.`
       );
       process.exit(1);
     }
@@ -223,10 +284,13 @@ var PackageJson = class {
   async isNextJs() {
     return this.hasPackage("next");
   }
-  async doesSatisfies(package_, version) {
+  async getPackageInfo(package_) {
+    return getPackageInfo(package_);
+  }
+  async doesSatisfy(package_, version) {
     await this.load();
     assert.ok(this.json !== null);
-    const packageInfo = await getPackageInfo(package_);
+    const packageInfo = await this.getPackageInfo(package_);
     if (packageInfo?.version === void 0) {
       return false;
     }
@@ -250,9 +314,10 @@ var PackageJson = class {
     const isReact = await isPackageListed("react");
     const isNestJs = await isPackageListed("@nestjs/core");
     if (isReact && isAdonis) {
-      throw new Error(
-        "You can't use both Adonis and React in the same project"
+      p4.cancel(
+        `Projekty korzystaj\u0105ce zar\xF3wno z ${c.magenta("Adonis")}a jak i ${c.cyan("React")}a nie s\u0105 wspierane.`
       );
+      process.exit(1);
     }
     if (isNestJs) {
       return "nestjs";
@@ -282,29 +347,29 @@ var PackageJson = class {
     this.json.scripts[name] = script;
     await this.save();
   }
-  async install(package_, options2) {
+  async install(package_, options2 = {}) {
     const isInstalled = await this.hasPackage(package_);
+    const installVersion = options2.version ?? "latest";
     if (!isInstalled) {
-      const spinner2 = p.spinner();
-      runIfInteractive(() => {
-        spinner2.start(`Instalowanie ${package_}`);
-      });
-      await $$`npm i ${options2?.dev === true ? "-D" : ""} ${package_}@latest`;
-      runIfInteractive(() => {
-        spinner2.stop(`${package_} zainstalowany \u{1F60D}`);
+      await runWithSpinner({
+        start: `Instalowanie pakietu ${package_}`,
+        stop: `${package_} zainstalowany \u{1F60D}`,
+        error: `Instalacja pakietu ${package_} nie powiod\u0142a si\u0119 \u{1F976}`,
+        callback: async () => {
+          await $$`npm i ${options2.dev === true ? "-D" : ""} ${package_}@${installVersion}`;
+        }
       });
       await this.load();
       return;
     }
-    const info = await getPackageInfo(package_);
-    if (info?.version !== void 0 && options2?.minVersion !== void 0 && !semver.satisfies(info.version, options2.minVersion) || options2?.alwaysUpdate === true) {
-      const spinner2 = p.spinner();
-      runIfInteractive(() => {
-        spinner2.start(`Aktualizowanie ${package_}`);
-      });
-      await $$`npm i ${options2.dev === true ? "-D" : ""} ${package_}@latest`;
-      runIfInteractive(() => {
-        spinner2.stop(`${package_} zaktualizowany \u{1F60D}`);
+    if (options2.alwaysUpdate === true || options2.version != null && !await this.doesSatisfy(package_, options2.version)) {
+      await runWithSpinner({
+        start: `Aktualizowanie pakietu ${package_}`,
+        stop: `${package_} zaktualizowany \u{1F60D}`,
+        error: `Aktualizacja pakietu ${package_} nie powiod\u0142a si\u0119 \u{1F976}`,
+        callback: async () => {
+          await $$`npm i ${options2.dev === true ? "-D" : ""} ${package_}@${installVersion}`;
+        }
       });
       await this.load();
     }
@@ -314,20 +379,6 @@ var PackageJson = class {
   }
 };
 
-// src/utils/polish-confirm.ts
-import * as p2 from "@clack/prompts";
-import isInteractive2 from "is-interactive";
-var polishConfirm = async (props) => {
-  if (!isInteractive2()) {
-    return true;
-  }
-  return p2.confirm({
-    active: "Tak",
-    inactive: "Nie",
-    ...props
-  });
-};
-
 // src/cli/install-commitlint.ts
 import { writeFile as writeFile2 } from "fs/promises";
 import path3 from "path";
@@ -367,7 +418,7 @@ var installCommitLint = async () => {
 };
 
 // src/cli/install-eslint.ts
-import * as p3 from "@clack/prompts";
+import * as p5 from "@clack/prompts";
 import { existsSync } from "fs";
 import * as fs from "fs/promises";
 import path4 from "path";
@@ -389,12 +440,15 @@ var packageJson3 = new PackageJson();
 var installEslint = async (isNonInteractive2 = false) => {
   const root2 = projectRoot();
   await packageJson3.load();
-  await packageJson3.install("eslint", { dev: true, minVersion: ">=9" });
+  await packageJson3.install("eslint", {
+    dev: true,
+    version: "^9"
+  });
   const type = await packageJson3.getProjectType();
   if (type === "react" && await packageJson3.isNextJs()) {
-    const is15 = await packageJson3.doesSatisfies("next", ">=15");
+    const is15 = await packageJson3.doesSatisfy("next", ">=15");
     if (!is15) {
-      p3.cancel(
+      p5.cancel(
         "Next.js musi by\u0107 w conajmniej wersji 15. Zaktualizuj Next.js i spr\xF3buj ponownie.\nWi\u0119cej informacji tutaj: https://nextjs.org/docs/app/building-your-application/upgrading/version-15"
       );
       process.exit(1);
@@ -410,7 +464,7 @@ var installEslint = async (isNonInteractive2 = false) => {
       "utf8"
     );
     if (eslintContent.includes("export default solvro(")) {
-      p3.note("Eslint jest ju\u017C skonfigurowany. Pomijam.");
+      p5.note("Eslint jest ju\u017C skonfigurowany. Pomijam.");
       return;
     } else {
       if (isNonInteractive2) {
@@ -419,8 +473,8 @@ var installEslint = async (isNonInteractive2 = false) => {
         const isConfirmed = await polishConfirm({
           message: `Znaleziono plik konfiguracyjny Eslint. Czy chcesz go nadpisa\u0107?`
         });
-        if (p3.isCancel(isConfirmed) || !isConfirmed) {
-          p3.cancel("Nadpisz plik konfiguracyjny Eslint i spr\xF3buj ponownie.");
+        if (p5.isCancel(isConfirmed) || !isConfirmed) {
+          p5.cancel("Nadpisz plik konfiguracyjny Eslint i spr\xF3buj ponownie.");
           process.exit(1);
         }
         await fs.rm(path4.join(root2, eslintConfig));
@@ -436,11 +490,11 @@ var installEslint = async (isNonInteractive2 = false) => {
 export default solvro();
 `
   );
-  p3.note("Plik konfiguracyjny Eslint zosta\u0142 utworzony.");
+  p5.note("Plik konfiguracyjny Eslint zosta\u0142 utworzony.");
 };
 
 // src/cli/install-ga.ts
-import * as p4 from "@clack/prompts";
+import * as p6 from "@clack/prompts";
 import { existsSync as existsSync2 } from "fs";
 import * as fs2 from "fs/promises";
 import path5 from "path";
@@ -693,7 +747,7 @@ var installGithubActions = async () => {
   const withCommitlint = await packageJson4.hasPackage("@commitlint/cli");
   if (type === "adonis") {
     if (!existsSync2(path5.join(projectDirectory, ".env.example"))) {
-      p4.cancel(
+      p6.cancel(
         "Nie znaleziono pliku .env.example. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu Adonisa."
       );
       process.exit(1);
@@ -743,7 +797,7 @@ var installGithubActions = async () => {
   await packageJson4.addScriptIfNotExists("lint", "eslint . --max-warnings=0");
   await packageJson4.addScriptIfNotExists("format", "prettier --write .");
   await packageJson4.addScriptIfNotExists("types:check", "tsc --noEmit");
-  p4.note("Dodano konfiguracj\u0119 CI i skrypty.");
+  p6.note("Dodano konfiguracj\u0119 CI i skrypty.");
 };
 
 // src/cli/install-lint-staged.ts
@@ -763,7 +817,7 @@ var installLintStaged = async () => {
 };
 
 // src/cli/install-prettier.ts
-import * as p5 from "@clack/prompts";
+import * as p7 from "@clack/prompts";
 import assert4 from "assert";
 import { existsSync as existsSync3 } from "fs";
 import * as fs3 from "fs/promises";
@@ -787,14 +841,17 @@ var installPrettier = async (isNonInteractive2 = false) => {
   const root2 = projectRoot();
   await packageJson6.load();
   assert4.ok(packageJson6.json !== null);
-  await packageJson6.install("prettier", { dev: true, minVersion: ">=3" });
+  await packageJson6.install("prettier", {
+    dev: true,
+    version: ">=3"
+  });
   const prettierConfig = prettierConfigNames.find(
     (configName) => existsSync3(path6.join(root2, configName))
   );
   const solvroPrettierPath = "@solvro/config/prettier";
   if (prettierConfig !== void 0 || packageJson6.json.prettier !== void 0) {
     if (packageJson6.json.prettier === solvroPrettierPath) {
-      p5.note("Konfiguracja Prettiera jest ju\u017C ustawiona. Pomijam.");
+      p7.note("Konfiguracja Prettiera jest ju\u017C ustawiona. Pomijam.");
       return;
     }
     if (isNonInteractive2) {
@@ -805,8 +862,8 @@ var installPrettier = async (isNonInteractive2 = false) => {
       const isConfirmed = await polishConfirm({
         message: `Znaleziono konfiguracj\u0119 Prettiera. Czy chcesz j\u0105 nadpisa\u0107?`
       });
-      if (p5.isCancel(isConfirmed) || !isConfirmed) {
-        p5.cancel("Usu\u0144 konfiguracje Prettiera i spr\xF3buj ponownie.");
+      if (p7.isCancel(isConfirmed) || !isConfirmed) {
+        p7.cancel("Usu\u0144 konfiguracje Prettiera i spr\xF3buj ponownie.");
         process.exit(1);
       }
       for (const configName of prettierConfigNames) {
@@ -816,7 +873,7 @@ var installPrettier = async (isNonInteractive2 = false) => {
   }
   packageJson6.json.prettier = solvroPrettierPath;
   await packageJson6.save();
-  p5.note("Konfiguracja Prettiera zosta\u0142a dodana.");
+  p7.note("Konfiguracja Prettiera zosta\u0142a dodana.");
 };
 
 // src/cli/index.ts
@@ -827,27 +884,28 @@ var options = program.opts();
 var isNonInteractive = process.argv.length > 2;
 async function main() {
   if (!isNonInteractive) {
-    p6.intro(c.bold(c.bgBlue("  @solvro/config  ")));
+    p8.intro(c2.bold(c2.bgBlue("  @solvro/config  ")));
   }
   const userAgent = getUserAgent();
   if (userAgent !== "npm") {
     const packageManager = userAgent ?? "unknown";
-    const warningMessage = `
-${c.red(c.bold(`\u26A0\uFE0F  OSTRZE\u017BENIE: ${packageManager} nie jest obs\u0142ugiwany \u26A0\uFE0F`))}
+    const warningMessage = `${c2.red(c2.bold(`\u26A0\uFE0F  OSTRZE\u017BENIE: ${packageManager} nie jest obs\u0142ugiwany \u26A0\uFE0F`))}
 
-Pr\xF3bujesz uruchomi\u0107 ten skrypt z ${c.yellow(packageManager)}'em, ale @solvro/config dzia\u0142a tylko z ${c.yellow("npm'em")}. 
+Pr\xF3bujesz uruchomi\u0107 ten skrypt ${c2.yellow(packageManager)}'em, ale @solvro/config obecnie dzia\u0142a tylko z ${c2.green("npm")}'em.
 
-Support dla innych mened\u017Cer\xF3w pakiet\xF3w nie jest planowany - chcemy jednolitego stacku technologicznego dla projekt\xF3w w naszym kochanym kole Solvro.
+${c2.white(`Support dla innych mened\u017Cer\xF3w pakiet\xF3w jest planowany w nadchodz\u0105cych wersjach - ${c2.yellow("zagwiazdkuj i spr\xF3buj ponownie wkr\xF3tce")}!`)}
 
-U\u017Cyj zamiast tego npm'a:
-${c.cyan("npx @solvro/config")}`;
+${c2.white(`W mi\u0119dzyczasie u\u017Cyj ${c2.green("npm")}'a:`)}
+${c2.cyan("npx @solvro/config")}`;
     if (isNonInteractive) {
       console.error(warningMessage);
     } else {
-      p6.cancel(warningMessage);
+      p8.cancel(warningMessage);
     }
     process.exit(1);
   }
+  const packageJson7 = new PackageJson();
+  await packageJson7.load();
   if (options.force !== true && !isGitClean()) {
     if (isNonInteractive) {
       console.error(
@@ -858,48 +916,44 @@ ${c.cyan("npx @solvro/config")}`;
     const isConfirmed = await polishConfirm({
       message: `Masz niezapisane zmiany w Git. Czy chcesz kontynuowa\u0107?`
     });
-    if (p6.isCancel(isConfirmed) || !isConfirmed) {
-      p6.cancel("Zapisz zmiany w Git i spr\xF3buj ponownie.");
+    if (p8.isCancel(isConfirmed) || !isConfirmed) {
+      p8.cancel("Zapisz zmiany w Git i spr\xF3buj ponownie.");
       process.exit(1);
     }
   }
-  const packageJson7 = new PackageJson();
+  if (await packageJson7.hasPackage("eslint") && !await packageJson7.doesSatisfy("eslint", "<10")) {
+    const eslint = await packageJson7.getPackageInfo("eslint");
+    const versionInfo = eslint?.version == null ? "" : ` Obecnie zainstalowana jest wersja ${c2.yellow(eslint.version)}.`;
+    const errorMessage = `ESLint w wersji powy\u017Cej 9 ${c2.red("nie jest jeszcze wspierany")}.${versionInfo}`;
+    const errorRetry = "Prosz\u0119 zainstalowa\u0107 wersj\u0119 9 i spr\xF3bowa\u0107 ponownie.";
+    if (isNonInteractive) {
+      console.error(errorMessage);
+      console.error(errorRetry);
+      process.exit(1);
+    }
+    const isConfirmed = await polishConfirm({
+      message: `${errorMessage} Zainstalowa\u0107 starsz\u0105 wersj\u0119 ${c2.magenta("ESLint")}'a? (Wymagane by kontynuowa\u0107)`
+    });
+    if (p8.isCancel(isConfirmed) || !isConfirmed) {
+      p8.cancel(errorRetry);
+      process.exit(1);
+    }
+    await packageJson7.install("eslint", { dev: true, version: "^9" });
+  }
   const projectType = await packageJson7.getProjectType();
   if (!isNonInteractive) {
     if (projectType === "adonis") {
-      const isConfirmed = await polishConfirm({
-        message: `Wygl\u0105da jakby\u015B u\u017Cywa\u0142 Adonisa. Czy to si\u0119 zgadza?`
-      });
-      if (p6.isCancel(isConfirmed) || !isConfirmed) {
-        p6.cancel("Zg\u0142o\u015B b\u0142\u0105d na GitHubie :(, a my spr\xF3bujemy pom\xF3c.");
-        process.exit(1);
-      }
+      await confirmProjectType(c2.magenta("Adonis"));
     }
     if (projectType === "react") {
-      const isConfirmed = await polishConfirm({
-        message: `Wygl\u0105da jakby\u015B u\u017Cywa\u0142 Reacta. Czy to si\u0119 zgadza?`
-      });
-      if (p6.isCancel(isConfirmed)) {
-        p6.cancel("\u{1F621}");
-        process.exit(1);
-      }
-      if (!isConfirmed) {
-        p6.cancel("Zg\u0142o\u015B b\u0142\u0105d na GitHubie :(, a my spr\xF3bujemy pom\xF3c.");
-        process.exit(1);
-      }
+      await confirmProjectType(c2.cyan("React"));
     }
     if (projectType === "nestjs") {
-      const isConfirmed = await polishConfirm({
-        message: `Wygl\u0105da jakby\u015B u\u017Cywa\u0142 NestJsa. Czy to si\u0119 zgadza?`
-      });
-      if (p6.isCancel(isConfirmed)) {
-        p6.cancel("\u{1F621}");
-        process.exit(1);
-      }
+      await confirmProjectType(c2.red("NestJS"));
     }
     if (projectType === "node") {
-      p6.cancel(
-        "Nie znaleziono ani Adonisa, Reacta, ani NestJsa. Musisz r\u0119cznie konfigurowa\u0107 projekt."
+      p8.cancel(
+        `Nie znaleziono ani ${c2.magenta("Adonis")}'a, ${c2.cyan("React")}'a, ani ${c2.white("NestJS")}'a. Musisz r\u0119cznie konfigurowa\u0107 projekt.`
       );
       process.exit(1);
     }
@@ -912,8 +966,8 @@ ${c.cyan("npx @solvro/config")}`;
         const isConfirmed = await polishConfirm({
           message: `Tw\xF3j projekt nie u\u017Cywa ESM (brak type: "module" w package.json). Czy chcesz to doda\u0107? (Wymagane by kontynuowa\u0107)`
         });
-        if (p6.isCancel(isConfirmed) || !isConfirmed) {
-          p6.cancel("Zmie\u0144 projekt na ESM i spr\xF3buj ponownie.");
+        if (p8.isCancel(isConfirmed) || !isConfirmed) {
+          p8.cancel("Zmie\u0144 projekt na ESM i spr\xF3buj ponownie.");
           process.exit(1);
         }
         await packageJson7.ensureESM();
@@ -943,35 +997,35 @@ ${c.cyan("npx @solvro/config")}`;
       process.exit(1);
     }
   } else {
-    const additionalTools = await p6.multiselect({
-      message: `Kt\xF3re rzeczy Ci\u0119 interesuj\u0105? ${c.gray("zaznacz spacj\u0105, potwierd\u017A enterem")}`,
+    const additionalTools = await p8.multiselect({
+      message: `Kt\xF3re rzeczy Ci\u0119 interesuj\u0105? ${c2.gray("zaznacz spacj\u0105, potwierd\u017A enterem")}`,
       initialValues: ["eslint", "prettier", "gh-action", "commitlint"],
       options: [
         {
           value: "eslint",
-          label: c.bold(c.blueBright("ESLint")),
+          label: c2.bold(c2.blueBright("ESLint")),
           hint: "sprawdzanie jako\u015Bci kodu"
         },
         {
           value: "prettier",
-          label: c.bold(c.yellowBright("Prettier")),
+          label: c2.bold(c2.yellowBright("Prettier")),
           hint: "formatowanie"
         },
         {
           value: "gh-action",
-          label: c.bold("GitHub Actions"),
+          label: c2.bold("GitHub Actions"),
           hint: "automatyczne testy na Githubie"
         },
         {
           value: "commitlint",
-          label: c.bold("Commitlint"),
+          label: c2.bold("Commitlint"),
           hint: "walidacja tre\u015Bci commit\xF3w"
         }
       ],
       required: false
     });
-    if (p6.isCancel(additionalTools) || additionalTools.length === 0) {
-      p6.cancel("Nie wybrano \u017Cadnych narz\u0119dzi.");
+    if (p8.isCancel(additionalTools) || additionalTools.length === 0) {
+      p8.cancel("Nie wybrano \u017Cadnych narz\u0119dzi.");
       process.exit(1);
     }
     toolsToInstall = additionalTools;
@@ -994,16 +1048,29 @@ ${c.cyan("npx @solvro/config")}`;
     await installGithubActions();
   }
   await packageJson7.clearInstall();
-  if (isNonInteractive) {
-    console.log("\u2705 Konfiguracja zako\u0144czona pomy\u015Blnie!");
-  } else {
-    p6.outro("\u2705 Konfiguracja zako\u0144czona pomy\u015Blnie!");
-  }
+  const printSuccess = isNonInteractive ? console.info : p8.outro;
+  printSuccess("\u2705 Konfiguracja zako\u0144czona pomy\u015Blnie!");
 }
-try {
-  void main();
-} catch (error) {
-  console.error("Wyst\u0105pi\u0142 b\u0142\u0105d:", error);
-  process.exit(1);
+async function mainWrapper() {
+  try {
+    await main();
+  } catch (error) {
+    if (process.env.NODE_ENV === "development") {
+      console.error(
+        c2.red("Unhandled error in main:"),
+        error instanceof Error ? error.message : error
+      );
+    } else {
+      const errorMessage = "Wyst\u0105pi\u0142 nieoczekiwany b\u0142\u0105d :( Prosz\u0119 zg\u0142osi\u0107 go tw\xF3rcom:";
+      if (isNonInteractive) {
+        console.error(errorMessage);
+        console.error(BUG_TRACKER_URL);
+      } else {
+        p8.cancel(`${errorMessage} ${BUG_TRACKER_URL}`);
+      }
+    }
+    process.exit(1);
+  }
 }
+void mainWrapper();
 //# sourceMappingURL=index.js.map