kasy-cli 1.5.3 → 1.7.0

package/lib/commands/notifications.js

@@ -1,13 +1,11 @@
 const path = require('node:path');
 const fs = require('fs-extra');
 const kleur = require('kleur');
-const prompts = require('prompts');
-const oraPackage = require('ora');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { slangGenerate } = require('../scaffold/shared/post-build');
 
-const ora = oraPackage.default || oraPackage;
-
 const SUPPORTED_LANGS = ['pt', 'en', 'es'];
 
 /**
@@ -110,49 +108,43 @@ async function promptForTexts(projectDir, t, flags) {
     };
   }
 
-  console.log(kleur.bold(`\n${t('notifications.prompt.intro')}\n`));
-  console.log(kleur.dim(`  ${t('notifications.prompt.hint')}\n`));
-
-  const response = await prompts([
-    {
-      type: 'text',
-      name: 'demoTitle',
-      message: t('notifications.prompt.demoTitle'),
-      initial: flags.demoTitle || current.demoTitle,
-      validate: (v) => (String(v || '').trim().length > 0 ? true : t('notifications.prompt.required')),
-    },
-    {
-      type: 'text',
-      name: 'demoBody',
-      message: t('notifications.prompt.demoBody'),
-      initial: flags.demoBody || current.demoBody,
-      validate: (v) => (String(v || '').trim().length > 0 ? true : t('notifications.prompt.required')),
-    },
-    {
-      type: 'text',
-      name: 'reminderTitle',
-      message: t('notifications.prompt.reminderTitle'),
-      initial: flags.reminderTitle || current.reminderTitle,
-      validate: (v) => (String(v || '').trim().length > 0 ? true : t('notifications.prompt.required')),
-    },
-    {
-      type: 'text',
-      name: 'reminderBody',
-      message: t('notifications.prompt.reminderBody'),
-      initial: flags.reminderBody || current.reminderBody,
-      validate: (v) => (String(v || '').trim().length > 0 ? true : t('notifications.prompt.required')),
-    },
-  ]);
-
-  if (!response.demoTitle) {
-    throw new Error(t('notifications.error.cancelled'));
-  }
+  const cancel = () => { ui.cancel(t('notifications.error.cancelled')); process.exit(0); };
+
+  ui.log.step(kleur.bold(t('notifications.prompt.intro')));
+  ui.log.message(kleur.dim(t('notifications.prompt.hint')));
+
+  const required = (v) => (String(v || '').trim().length > 0 ? undefined : t('notifications.prompt.required'));
+
+  const demoTitle = await ui.text({
+    message: t('notifications.prompt.demoTitle'),
+    initialValue: flags.demoTitle || current.demoTitle,
+    validate: required,
+    onCancel: cancel,
+  });
+  const demoBody = await ui.text({
+    message: t('notifications.prompt.demoBody'),
+    initialValue: flags.demoBody || current.demoBody,
+    validate: required,
+    onCancel: cancel,
+  });
+  const reminderTitle = await ui.text({
+    message: t('notifications.prompt.reminderTitle'),
+    initialValue: flags.reminderTitle || current.reminderTitle,
+    validate: required,
+    onCancel: cancel,
+  });
+  const reminderBody = await ui.text({
+    message: t('notifications.prompt.reminderBody'),
+    initialValue: flags.reminderBody || current.reminderBody,
+    validate: required,
+    onCancel: cancel,
+  });
 
   return {
-    demoTitle: response.demoTitle.trim(),
-    demoBody: response.demoBody.trim(),
-    reminderTitle: response.reminderTitle.trim(),
-    reminderBody: response.reminderBody.trim(),
+    demoTitle: String(demoTitle).trim(),
+    demoBody: String(demoBody).trim(),
+    reminderTitle: String(reminderTitle).trim(),
+    reminderBody: String(reminderBody).trim(),
   };
 }
 
@@ -169,6 +161,9 @@ async function runNotificationsText(directory, options = {}) {
   await assertKasyProject(projectDir, t);
   await assertLocalNotificationsEnabled(projectDir, t);
 
+  printCompactHeader(t);
+  ui.intro(t('notifications.prompt.intro'));
+
   const targetLangs = resolveTargetLangs(options.lang);
   const texts = await promptForTexts(
     projectDir,
@@ -181,27 +176,32 @@ async function runNotificationsText(directory, options = {}) {
     },
   );
 
-  const writeSpinner = ora(t('notifications.writing')).start();
+  const writeSpinner = ui.spinner();
+  writeSpinner.start(t('notifications.writing'));
   await writeNotificationTexts(projectDir, targetLangs, texts);
-  writeSpinner.succeed(t('notifications.written', { langs: targetLangs.join(', ') }));
+  writeSpinner.stop(t('notifications.written', { langs: targetLangs.join(', ') }));
 
-  const slangSpinner = ora(t('notifications.slang')).start();
+  const slangSpinner = ui.spinner();
+  slangSpinner.start(t('notifications.slang'));
   const slangResult = await slangGenerate(projectDir);
   if (slangResult.ok) {
-    slangSpinner.succeed(t('notifications.slangDone'));
+    slangSpinner.stop(t('notifications.slangDone'));
   } else {
-    slangSpinner.warn(t('notifications.slangFailed'));
-    console.log(kleur.dim('  dart run slang'));
+    slangSpinner.stop(`⚠ ${t('notifications.slangFailed')}`);
+    ui.log.message(kleur.dim('dart run slang'));
   }
 
-  console.log(kleur.green(`\n✓ ${t('notifications.done')}\n`));
-  console.log(kleur.dim(`  ${t('notifications.summary.demo')}`));
-  console.log(kleur.dim(`    ${kleur.white(texts.demoTitle)}`));
-  console.log(kleur.dim(`    ${kleur.white(texts.demoBody)}`));
-  console.log(kleur.dim(`  ${t('notifications.summary.reminder')}`));
-  console.log(kleur.dim(`    ${kleur.white(texts.reminderTitle)}`));
-  console.log(kleur.dim(`    ${kleur.white(texts.reminderBody)}`));
-  console.log('');
+  const summary = [
+    `${t('notifications.summary.demo')}`,
+    `  ${kleur.white(texts.demoTitle)}`,
+    `  ${kleur.white(texts.demoBody)}`,
+    `${t('notifications.summary.reminder')}`,
+    `  ${kleur.white(texts.reminderTitle)}`,
+    `  ${kleur.white(texts.reminderBody)}`,
+  ].join('\n');
+  ui.note(summary);
+
+  ui.outro(t('notifications.done'));
 }
 
 module.exports = { runNotificationsText, readNotificationTexts, writeNotificationTexts };

package/lib/commands/remove.js

@@ -6,8 +6,8 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const pkg = require('../../package.json');
 const kleur = require('kleur');
-const prompts = require('prompts');
-const oraPackage = require('ora');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const {
   AVAILABLE_FEATURES,
@@ -29,7 +29,6 @@ const {
 const { toPackageName } = require('../scaffold/backends/firebase/tokens');
 
 const execAsync = promisify(exec);
-const ora = oraPackage.default || oraPackage;
 
 // ── Module metadata ──────────────────────────────────────────────────────────
 
@@ -299,7 +298,8 @@ async function runRemove(module, options = {}) {
   const projectDir = path.resolve(options.directory || '.');
 
   if (!module) {
-    console.log(kleur.yellow(t('remove.error.noModule')));
+    printCompactHeader(t);
+    ui.log.warn(t('remove.error.noModule'));
     return;
   }
 
@@ -325,29 +325,28 @@ async function runRemove(module, options = {}) {
   // 3. Check that the module is actually active
   const activeModules = await getActiveModules(kitSetup, projectDir);
   if (!activeModules.includes(normalized)) {
-    console.log(kleur.yellow(`\n${t('remove.error.notActive', { module: normalized })}\n`));
+    printCompactHeader(t);
+    ui.log.warn(t('remove.error.notActive', { module: normalized }));
     return;
   }
 
+  printCompactHeader(t);
+  ui.intro(t('remove.removing', { module: normalized }));
+  const cancel = () => { ui.cancel(t('remove.cancelled')); process.exit(0); };
+
   // 4. Confirm before destructive action (skip with --yes)
   if (!options.yes) {
-    const { confirmed } = await prompts(
-      {
-        type: 'confirm',
-        name: 'confirmed',
-        message: t('remove.confirm', { module: normalized }),
-        initial: false,
-      },
-      { onCancel: () => { throw new Error(t('remove.cancelled')); } }
-    );
+    const confirmed = await ui.confirm({
+      message: t('remove.confirm', { module: normalized }),
+      initialValue: false,
+      onCancel: cancel,
+    });
     if (!confirmed) {
-      console.log(kleur.dim(`\n${t('remove.cancelled')}\n`));
+      ui.outro(t('remove.cancelled'));
       return;
     }
   }
 
-  console.log(kleur.bold(`\n${t('remove.removing', { module: normalized })}\n`));
-
   // Build the module list that will be active AFTER removal (used for stub regen)
   const modulesAfterRemoval = activeModules.filter((m) => m !== normalized);
 
@@ -391,7 +390,7 @@ async function runRemove(module, options = {}) {
     await removePubspecDep(projectDir, 'sentry_flutter');
     await writeNoOpSentryUsages(projectDir).catch(() => {});
   } else if (normalized === 'sentry' && sentryStillNeeded) {
-    console.log(kleur.dim(`\n  ${t('remove.warn.sentry.shared')}\n`));
+    ui.log.message(kleur.dim(t('remove.warn.sentry.shared')));
   }
 
   // 10. Remove files and directories added by the module's patch
@@ -430,12 +429,13 @@ async function runRemove(module, options = {}) {
 
   // 13. flutter pub get
   {
-    const spinner = ora(t('remove.pubGet')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('remove.pubGet'));
     try {
       await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
-      spinner.succeed(t('remove.pubGetDone'));
+      spinner.stop(t('remove.pubGetDone'));
     } catch {
-      spinner.warn(t('remove.pubGetFailed'));
+      spinner.stop(`⚠ ${t('remove.pubGetFailed')}`);
     }
   }
 
@@ -444,23 +444,24 @@ async function runRemove(module, options = {}) {
     'revenuecat', 'analytics', 'sentry', 'onboarding', 'llm_chat', 'feedback',
   ].includes(normalized);
   if (needsBuildRunner) {
-    const spinner = ora(t('remove.buildRunner')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('remove.buildRunner'));
     try {
       await execAsync(
         'dart run build_runner build --delete-conflicting-outputs',
         { cwd: projectDir, timeout: 600_000 }
       );
-      spinner.succeed(t('remove.buildRunnerDone'));
+      spinner.stop(t('remove.buildRunnerDone'));
     } catch {
-      spinner.warn(t('remove.buildRunnerFailed'));
+      spinner.stop(`⚠ ${t('remove.buildRunnerFailed')}`);
     }
   }
 
-  console.log(kleur.green(`\n✓ ${t('remove.success', { module: normalized })}\n`));
-
   if (normalized === 'ci') {
-    console.log(kleur.dim(`  ${t('remove.warn.ci')}\n`));
+    ui.log.message(kleur.dim(t('remove.warn.ci')));
   }
+
+  ui.outro(t('remove.success', { module: normalized }));
 }
 
 module.exports = { runRemove };

package/lib/commands/run.js

@@ -3,6 +3,7 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const kleur = require('kleur');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
+const { printCompactHeader } = require('../utils/brand');
 
 /**
  * Read dart-define args from .vscode/launch.json.
@@ -53,7 +54,8 @@ async function runRun(directory, options = {}) {
 
   const args = ['run', ...deviceArgs, ...dartDefines];
 
-  console.log(kleur.bold(`\n${t('run.launching')}`));
+  printCompactHeader(t);
+  console.log(kleur.bold(`${t('run.launching')}`));
   console.log(kleur.dim(`  flutter ${args.join(' ')}`));
   console.log(kleur.dim(`  ✦ ${t('run.updateHint.prefix')} `) + kleur.cyan('kasy update') + kleur.dim(` ${t('run.updateHint.suffix')}\n`));