@solvro/config 3.0.0-beta.4 → 3.0.0-beta.5

package/dist/cli/index.js

@@ -1,12 +1,12 @@
 // src/cli/index.ts
-import * as p11 from "@clack/prompts";
+import * as p13 from "@clack/prompts";
 import { Command } from "commander";
-import c5 from "picocolors";
+import c8 from "picocolors";
 
 // package.json
 var package_default = {
   name: "@solvro/config",
-  version: "3.0.0-beta.3",
+  version: "3.0.0-beta.4",
   description: "Solvro's engineering style guide",
   keywords: [
     "eslint",
@@ -218,9 +218,9 @@ var confirmProjectType = async (projectType) => {
 
 // src/utils/is-git-clean.ts
 import { execSync } from "child_process";
-function isGitClean() {
+function isGitClean(options2) {
   try {
-    execSync("git diff-index --quiet HEAD --");
+    execSync("git diff-index --quiet HEAD --", options2);
     return true;
   } catch {
     return false;
@@ -234,7 +234,7 @@ import assert from "assert";
 import { stat, writeFile } from "fs/promises";
 import path2 from "path";
 import { getUserAgent } from "package-manager-detector/detect";
-import c4 from "picocolors";
+import c5 from "picocolors";
 import semver from "semver";
 
 // src/utils/git-root.ts
@@ -326,11 +326,7 @@ var warnInconsistentUserAgent = ({
 
 Pr\xF3bujesz uruchomi\u0107 ten skrypt ${c.yellow(userAgent.name)}-em, ale w tym projekcie wykryto mened\u017Cer pakiet\xF3w ${c.yellow(detectedPackageManager)}.
 ${isSupportedPackageManager(detectedPackageManager) ? hintInstallWithDetected(PACKAGE_MANAGER_CONFIGS[detectedPackageManager]) : warnUnsupported(detectedPackageManager)}`;
-  if (checkIsNonInteractive()) {
-    console.error(warningMessage);
-  } else {
-    p4.cancel(warningMessage);
-  }
+  p4.cancel(warningMessage);
 };
 
 // src/utils/warn-missing-lockfile.ts
@@ -348,37 +344,35 @@ ${c2.white("Je\u015Bli to si\u0119 zgadza, zainstaluj najpierw zale\u017Cno\u015
 
 ${c2.cyan(manager.installDependencies)}
 ${c2.cyan(`${manager.downloadExecute} @solvro/config@latest`)}`;
-  if (checkIsNonInteractive()) {
-    console.error(warningMessage);
-  } else {
-    p5.cancel(warningMessage);
-  }
+  p5.cancel(warningMessage);
 };
 
 // src/utils/warn-unsupported-package-manager.ts
 import * as p6 from "@clack/prompts";
+import c4 from "picocolors";
+
+// src/utils/format-log.ts
 import c3 from "picocolors";
+var formatLink = (link) => c3.white(c3.underline(link));
+
+// src/utils/warn-unsupported-package-manager.ts
 var warnUnsupportedPackageManager = ({
   userAgent
 }) => {
   const packageManager = userAgent ?? "<nieznany>";
-  const warningMessage = `${c3.red(c3.bold(`\u26A0\uFE0F  OSTRZE\u017BENIE: ${packageManager} nie jest obs\u0142ugiwany \u26A0\uFE0F`))}
+  const warningMessage = `${c4.red(c4.bold(`\u26A0\uFE0F  OSTRZE\u017BENIE: ${packageManager} nie jest obs\u0142ugiwany \u26A0\uFE0F`))}
 
-Pr\xF3bujesz uruchomi\u0107 ten skrypt ${c3.yellow(packageManager)}-em, ale @solvro/config obecnie dzia\u0142a tylko z nast\u0119puj\u0105cymi mened\u017Cerami pakiet\xF3w:
+Pr\xF3bujesz uruchomi\u0107 ten skrypt ${c4.yellow(packageManager)}-em, ale @solvro/config obecnie dzia\u0142a tylko z nast\u0119puj\u0105cymi mened\u017Cerami pakiet\xF3w:
 
-${SUPPORTED_PACKAGE_MANAGERS.map((manager) => c3.white(`- ${c3.cyan(manager)}`)).join("\n")}
+${SUPPORTED_PACKAGE_MANAGERS.map((manager) => c4.white(`- ${c4.cyan(manager)}`)).join("\n")}
 
-${c3.white(`Chcesz, aby dodano wsparcie dla ${c3.yellow(packageManager)}-a? Daj nam zna\u0107!`)}
-${c3.white(c3.underline(BUG_TRACKER_URL))}
+${c4.white(`Chcesz, aby dodano wsparcie dla ${c4.yellow(packageManager)}-a? Daj nam zna\u0107!`)}
+${formatLink(BUG_TRACKER_URL)}
 
-${c3.white(`W mi\u0119dzyczasie u\u017Cyj innego mened\u017Cera:`)}
+${c4.white(`W mi\u0119dzyczasie u\u017Cyj innego mened\u017Cera:`)}
 
-${Object.values(PACKAGE_MANAGER_CONFIGS).map((config) => c3.cyan(`${config.downloadExecute} @solvro/config`)).join(c3.white("\nlub\n"))}`;
-  if (checkIsNonInteractive()) {
-    console.error(warningMessage);
-  } else {
-    p6.cancel(warningMessage);
-  }
+${Object.values(PACKAGE_MANAGER_CONFIGS).map((config) => c4.cyan(`${config.downloadExecute} @solvro/config`)).join(c4.white("\nlub\n"))}`;
+  p6.cancel(warningMessage);
 };
 
 // src/utils/package-json.ts
@@ -426,7 +420,7 @@ var PackageJson = class {
     const json = await loadPackageJSON(projectRoot());
     if (json === null) {
       p7.cancel(
-        `Nie znaleziono pliku ${c4.cyan("package.json")}. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu.`
+        `Nie znaleziono pliku ${c5.cyan("package.json")}. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu.`
       );
       process.exit(1);
     }
@@ -469,7 +463,7 @@ var PackageJson = class {
     const isNestJs = await isPackageListed("@nestjs/core");
     if (isReact && isAdonis) {
       p7.cancel(
-        `Projekty korzystaj\u0105ce zar\xF3wno z ${c4.magenta("Adonis")}a jak i ${c4.cyan("React")}a nie s\u0105 wspierane.`
+        `Projekty korzystaj\u0105ce zar\xF3wno z ${c5.magenta("Adonis")}a jak i ${c5.cyan("React")}a nie s\u0105 wspierane.`
       );
       process.exit(1);
     }
@@ -563,7 +557,14 @@ var PackageJson = class {
   }
   async clearInstall() {
     const [command, ...options2] = this.manager.cleanInstall.split(" ");
-    await $$(command, options2);
+    await runWithSpinner({
+      start: "Instalowanie pakiet\xF3w na \u015Bwie\u017Co",
+      stop: "Wszystkie pakiety zainstalowane \u{1F60D}",
+      error: "Instalacja pakiet\xF3w na \u015Bwie\u017Co nie powiod\u0142a si\u0119 \u{1F976}",
+      callback: async () => {
+        await $$(command, options2);
+      }
+    });
   }
   /**
    * Gets the pnpm major version from package.json packageManager field or user agent.
@@ -590,6 +591,38 @@ var PackageJson = class {
   }
 };
 
+// src/utils/print-intro.ts
+import * as p8 from "@clack/prompts";
+import { readFileSync } from "fs";
+import c6 from "picocolors";
+var printIntro = () => {
+  const packageJsonUrl = new URL("../../package.json", import.meta.url);
+  const packageJson7 = JSON.parse(readFileSync(packageJsonUrl, "utf8"));
+  const packageRoot = new URL("../", packageJsonUrl);
+  const clean = isGitClean({ cwd: packageRoot, stdio: "ignore" });
+  const version = packageJson7.version == null || packageJson7.version.trim() === "" ? c6.red("(unknown version)") : c6.green(c6.bold(`v${packageJson7.version}`));
+  const dirtyStatus = clean ? "" : c6.white(" (dirty)");
+  p8.intro(
+    `  ${c6.blueBright(c6.bold("@solvro/config"))} ${version}${dirtyStatus}  `
+  );
+};
+
+// src/utils/print-outro.ts
+import * as p9 from "@clack/prompts";
+import c7 from "picocolors";
+var PROJECT_DOCS_URL = "https://docs.solvro.pl/projects/creating#konfiguracja-repozytorium";
+var printOutro = () => {
+  p9.log.success("Konfiguracja zako\u0144czona pomy\u015Blnie!");
+  p9.note(
+    `1. ${c7.white(`${c7.bold("Obowi\u0105zkowo")} zapoznaj si\u0119 z ${c7.cyan("dokumentacj\u0105 tworzenia projekt\xF3w")}:`)}
+   ${formatLink(PROJECT_DOCS_URL)}
+2. ${c7.white(`Pami\u0119taj o zostawianiu nam ${c7.yellow("gwiazdek na GitHubie")}! \u2B50`)}
+   ${formatLink(REPO_URL)}`,
+    "Kolejne kroki"
+  );
+  p9.outro("Mi\u0142ego dnia! \u{1F44B}");
+};
+
 // src/cli/install-commitlint.ts
 import { writeFile as writeFile2 } from "fs/promises";
 import path3 from "path";
@@ -630,7 +663,7 @@ var installCommitLint = async () => {
 };
 
 // src/cli/install-eslint.ts
-import * as p8 from "@clack/prompts";
+import * as p10 from "@clack/prompts";
 import { existsSync } from "fs";
 import * as fs from "fs/promises";
 import path4 from "path";
@@ -660,8 +693,8 @@ var installEslint = async (isNonInteractive2 = false) => {
   if (type === "react" && await packageJson3.isNextJs()) {
     const is15 = await packageJson3.doesSatisfy("next", ">=15");
     if (!is15) {
-      p8.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"
+      p10.cancel(
+        "Next.js musi by\u0107 w co najmniej 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);
     }
@@ -676,17 +709,17 @@ var installEslint = async (isNonInteractive2 = false) => {
       "utf8"
     );
     if (eslintContent.includes("export default solvro(")) {
-      p8.note("Eslint jest ju\u017C skonfigurowany. Pomijam.");
+      p10.log.warning("ESLint jest ju\u017C skonfigurowany. Pomijam.");
       return;
     } else {
       if (isNonInteractive2) {
         await fs.rm(path4.join(root2, eslintConfig));
       } else {
         const isConfirmed = await polishConfirm({
-          message: `Znaleziono plik konfiguracyjny Eslint. Czy chcesz go nadpisa\u0107?`
+          message: `Znaleziono plik konfiguracyjny ESLint. Czy chcesz go nadpisa\u0107?`
         });
-        if (p8.isCancel(isConfirmed) || !isConfirmed) {
-          p8.cancel("Nadpisz plik konfiguracyjny Eslint i spr\xF3buj ponownie.");
+        if (p10.isCancel(isConfirmed) || !isConfirmed) {
+          p10.cancel("Nadpisz plik konfiguracyjny ESLint i spr\xF3buj ponownie.");
           process.exit(1);
         }
         await fs.rm(path4.join(root2, eslintConfig));
@@ -702,11 +735,11 @@ var installEslint = async (isNonInteractive2 = false) => {
 export default solvro();
 `
   );
-  p8.note("Plik konfiguracyjny Eslint zosta\u0142 utworzony.");
+  p10.log.step("Plik konfiguracyjny ESLint zosta\u0142 utworzony.");
 };
 
 // src/cli/install-ga.ts
-import * as p9 from "@clack/prompts";
+import * as p11 from "@clack/prompts";
 import { existsSync as existsSync2 } from "fs";
 import * as fs2 from "fs/promises";
 import path5 from "path";
@@ -971,7 +1004,7 @@ var installGithubActions = async () => {
   const withCommitlint = await packageJson4.hasPackage("@commitlint/cli");
   if (type === "adonis") {
     if (!existsSync2(path5.join(projectDirectory, ".env.example"))) {
-      p9.cancel(
+      p11.cancel(
         "Nie znaleziono pliku .env.example. Upewnij si\u0119, \u017Ce jeste\u015B w katalogu projektu Adonisa."
       );
       process.exit(1);
@@ -1022,7 +1055,7 @@ var installGithubActions = async () => {
       'prettier --write "src/**/*.ts" "test/**/*.ts"'
     );
     if (!formatScriptUpdated) {
-      p9.log.warn(
+      p11.log.warning(
         "Aktualizacja skryptu format zosta\u0142a pomini\u0119ta, poniewa\u017C zosta\u0142 on zmieniony lub nie istnieje. R\u0119cznie zaktualizuj skrypt format w package.json, aby formatowa\u0142 wszystkie pliki projektu, a nie tylko te w katalogach src i test."
       );
     }
@@ -1037,7 +1070,7 @@ var installGithubActions = async () => {
   await packageJson4.addScriptIfNotExists("format:check", "prettier --check .");
   await packageJson4.addScriptIfNotExists("lint", "eslint . --max-warnings=0");
   await packageJson4.addScriptIfNotExists("types:check", "tsc --noEmit");
-  p9.note("Dodano konfiguracj\u0119 CI i skrypty.");
+  p11.log.step("Dodano konfiguracj\u0119 CI i skrypty.");
 };
 
 // src/cli/install-lint-staged.ts
@@ -1062,7 +1095,7 @@ var installLintStaged = async () => {
 };
 
 // src/cli/install-prettier.ts
-import * as p10 from "@clack/prompts";
+import * as p12 from "@clack/prompts";
 import assert4 from "assert";
 import { existsSync as existsSync3 } from "fs";
 import * as fs3 from "fs/promises";
@@ -1096,7 +1129,7 @@ var installPrettier = async (isNonInteractive2 = false) => {
   const solvroPrettierPath = "@solvro/config/prettier";
   if (prettierConfig !== void 0 || packageJson6.json.prettier !== void 0) {
     if (packageJson6.json.prettier === solvroPrettierPath) {
-      p10.note("Konfiguracja Prettiera jest ju\u017C ustawiona. Pomijam.");
+      p12.log.warning("Konfiguracja Prettiera jest ju\u017C ustawiona. Pomijam.");
       return;
     }
     if (isNonInteractive2) {
@@ -1107,8 +1140,8 @@ var installPrettier = async (isNonInteractive2 = false) => {
       const isConfirmed = await polishConfirm({
         message: `Znaleziono konfiguracj\u0119 Prettiera. Czy chcesz j\u0105 nadpisa\u0107?`
       });
-      if (p10.isCancel(isConfirmed) || !isConfirmed) {
-        p10.cancel("Usu\u0144 konfiguracje Prettiera i spr\xF3buj ponownie.");
+      if (p12.isCancel(isConfirmed) || !isConfirmed) {
+        p12.cancel("Usu\u0144 konfiguracje Prettiera i spr\xF3buj ponownie.");
         process.exit(1);
       }
       for (const configName of prettierConfigNames) {
@@ -1118,7 +1151,7 @@ var installPrettier = async (isNonInteractive2 = false) => {
   }
   packageJson6.json.prettier = solvroPrettierPath;
   await packageJson6.save();
-  p10.note("Konfiguracja Prettiera zosta\u0142a dodana.");
+  p12.log.step("Konfiguracja Prettiera zosta\u0142a dodana.");
 };
 
 // src/cli/index.ts
@@ -1128,43 +1161,40 @@ program.parse();
 var options = program.opts();
 var isNonInteractive = checkIsNonInteractive();
 async function main() {
-  if (!isNonInteractive) {
-    p11.intro(c5.bold(c5.bgBlue("  @solvro/config  ")));
-  }
+  printIntro();
   const packageJson7 = new PackageJson();
   packageJson7.verifyPackageManager();
   await packageJson7.load();
   await packageJson7.validateUserAgentConsistency();
   if (options.force !== true && !isGitClean()) {
     if (isNonInteractive) {
-      console.error(
-        "Repozytorium Git ma niezatwierdzone zmiany. U\u017Cyj --force, aby pomin\u0105\u0107 to sprawdzenie."
-      );
+      p13.log.error("Repozytorium Git ma niezatwierdzone zmiany.");
+      p13.cancel("U\u017Cyj --force, aby pomin\u0105\u0107 to sprawdzenie.");
       process.exit(1);
     }
     const isConfirmed = await polishConfirm({
       message: `Masz niezapisane zmiany w Git. Czy chcesz kontynuowa\u0107?`
     });
-    if (p11.isCancel(isConfirmed) || !isConfirmed) {
-      p11.cancel("Zapisz zmiany w Git i spr\xF3buj ponownie.");
+    if (p13.isCancel(isConfirmed) || !isConfirmed) {
+      p13.cancel("Zapisz zmiany w Git i spr\xF3buj ponownie.");
       process.exit(1);
     }
   }
   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 ${c5.yellow(eslint.version)}.`;
-    const errorMessage = `ESLint w wersji powy\u017Cej 9 ${c5.red("nie jest jeszcze wspierany")}.${versionInfo}`;
+    const versionInfo = eslint?.version == null ? "" : ` Obecnie zainstalowana jest wersja ${c8.yellow(eslint.version)}.`;
+    const errorMessage = `ESLint w wersji powy\u017Cej 9 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);
+      p13.log.error(errorMessage);
+      p13.cancel(errorRetry);
       process.exit(1);
     }
     const isConfirmed = await polishConfirm({
-      message: `${errorMessage} Zainstalowa\u0107 starsz\u0105 wersj\u0119 ${c5.magenta("ESLint")}'a? (Wymagane by kontynuowa\u0107)`
+      message: `${errorMessage} Zainstalowa\u0107 starsz\u0105 wersj\u0119 ${c8.magenta("ESLint")}'a? (Wymagane by kontynuowa\u0107)`
     });
-    if (p11.isCancel(isConfirmed) || !isConfirmed) {
-      p11.cancel(errorRetry);
+    if (p13.isCancel(isConfirmed) || !isConfirmed) {
+      p13.cancel(errorRetry);
       process.exit(1);
     }
     await packageJson7.install("eslint", { dev: true, version: "^9" });
@@ -1172,17 +1202,17 @@ async function main() {
   const projectType = await packageJson7.getProjectType();
   if (!isNonInteractive) {
     if (projectType === "adonis") {
-      await confirmProjectType(c5.magenta("Adonis"));
+      await confirmProjectType(c8.magenta("Adonis"));
     }
     if (projectType === "react") {
-      await confirmProjectType(c5.cyan("React"));
+      await confirmProjectType(c8.cyan("React"));
     }
     if (projectType === "nestjs") {
-      await confirmProjectType(c5.red("NestJS"));
+      await confirmProjectType(c8.red("NestJS"));
     }
     if (projectType === "node") {
-      p11.cancel(
-        `Nie znaleziono ani ${c5.magenta("Adonis")}-a, ${c5.cyan("React")}-a, ani ${c5.white("NestJS")}-a. Musisz r\u0119cznie konfigurowa\u0107 projekt.`
+      p13.cancel(
+        `Nie znaleziono ani ${c8.magenta("Adonis")}-a, ${c8.cyan("React")}-a, ani ${c8.white("NestJS")}-a. Musisz r\u0119cznie konfigurowa\u0107 projekt.`
       );
       process.exit(1);
     }
@@ -1195,8 +1225,8 @@ async function main() {
         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 (p11.isCancel(isConfirmed) || !isConfirmed) {
-          p11.cancel("Zmie\u0144 projekt na ESM i spr\xF3buj ponownie.");
+        if (p13.isCancel(isConfirmed) || !isConfirmed) {
+          p13.cancel("Zmie\u0144 projekt na ESM i spr\xF3buj ponownie.");
           process.exit(1);
         }
         await packageJson7.ensureESM();
@@ -1220,41 +1250,42 @@ async function main() {
       toolsToInstall.push("commitlint");
     }
     if (toolsToInstall.length === 0) {
-      console.error(
-        "Nie wybrano \u017Cadnych narz\u0119dzi. U\u017Cyj --eslint, --prettier, --gh-action, --commitlint, lub --all"
+      p13.log.error("Nie wybrano \u017Cadnych narz\u0119dzi.");
+      p13.cancel(
+        "U\u017Cyj --eslint, --prettier, --gh-action, --commitlint, lub --all"
       );
       process.exit(1);
     }
   } else {
-    const additionalTools = await p11.multiselect({
-      message: `Kt\xF3re rzeczy Ci\u0119 interesuj\u0105? ${c5.gray("zaznacz spacj\u0105, potwierd\u017A enterem")}`,
+    const additionalTools = await p13.multiselect({
+      message: `Kt\xF3re rzeczy Ci\u0119 interesuj\u0105? ${c8.gray("zaznacz spacj\u0105, potwierd\u017A enterem")}`,
       initialValues: ["eslint", "prettier", "gh-action", "commitlint"],
       options: [
         {
           value: "eslint",
-          label: c5.bold(c5.blueBright("ESLint")),
+          label: c8.bold(c8.blueBright("ESLint")),
           hint: "sprawdzanie jako\u015Bci kodu"
         },
         {
           value: "prettier",
-          label: c5.bold(c5.yellowBright("Prettier")),
+          label: c8.bold(c8.yellowBright("Prettier")),
           hint: "formatowanie"
         },
         {
           value: "gh-action",
-          label: c5.bold("GitHub Actions"),
+          label: c8.bold("GitHub Actions"),
           hint: "automatyczne testy na GitHubie"
         },
         {
           value: "commitlint",
-          label: c5.bold("Commitlint"),
+          label: c8.bold("Commitlint"),
           hint: "walidacja tre\u015Bci commit\xF3w"
         }
       ],
       required: false
     });
-    if (p11.isCancel(additionalTools) || additionalTools.length === 0) {
-      p11.cancel("Nie wybrano \u017Cadnych narz\u0119dzi.");
+    if (p13.isCancel(additionalTools) || additionalTools.length === 0) {
+      p13.cancel("Nie wybrano \u017Cadnych narz\u0119dzi.");
       process.exit(1);
     }
     toolsToInstall = additionalTools;
@@ -1280,26 +1311,18 @@ async function main() {
   if (toolsToInstall.includes("prettier")) {
     await packageJson7.localExecute("prettier", "--write", "package.json");
   }
-  const printSuccess = isNonInteractive ? console.info : p11.outro;
-  printSuccess("\u2705 Konfiguracja zako\u0144czona pomy\u015Blnie!");
+  printOutro();
 }
 async function mainWrapper() {
   try {
     await main();
   } catch (error) {
     if (process.env.NODE_ENV === "development") {
-      console.error(
-        c5.red("Unhandled error in main:"),
-        error instanceof Error ? error.message : error
-      );
+      p13.cancel("Unhandled error in main:");
+      console.error(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 {
-        p11.cancel(`${errorMessage} ${BUG_TRACKER_URL}`);
-      }
+      p13.log.error("Wyst\u0105pi\u0142 nieoczekiwany b\u0142\u0105d :(");
+      p13.cancel(`Prosz\u0119 zg\u0142osi\u0107 go tw\xF3rcom: ${BUG_TRACKER_URL}`);
     }
     process.exit(1);
   }