fabrica-e-commerce 0.1.16 → 0.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fabrica-e-commerce",
-  "version": "0.1.16",
-  "description": "Orange themed CMD launcher for deploying Fabrica e-commerce stores with Supabase and Vercel.",
+  "version": "0.2.1",
+  "description": "CLI launcher for deploying Fabrica e-commerce stores — Supabase + Vercel, works on Windows, macOS, Linux & Termux.",
   "type": "module",
   "bin": {
     "fabrica": "bin/fabrica.js",
@@ -25,9 +25,11 @@
     "ecommerce",
     "supabase",
     "vercel",
-    "cli"
+    "cli",
+    "storefront",
+    "nextjs"
   ],
-  "author": "Fabrica",
+  "author": "SPARROW AI SOLUTION",
   "license": "MIT",
   "engines": {
     "node": ">=18.17"
@@ -41,6 +43,11 @@
     "url": "https://github.com/trucount/fabrica-e-c/issues"
   },
   "dependencies": {
-    "boxen": "^8.0.1"
+    "boxen": "^8.0.1",
+    "chalk": "^5.4.1",
+    "cli-table3": "^0.6.5",
+    "figures": "^6.1.0",
+    "gradient-string": "^3.0.0",
+    "ora": "^8.2.0"
   }
 }

package/src/bridge.js

@@ -1,7 +1,7 @@
 import { BRIDGE_API_KEY, BRIDGE_ORIGIN, POLL_INTERVAL_MS, POLL_TIMEOUT_MS } from './config.js';
 import { FULL_SQL } from './sql.js';
 import { openUrl } from './system.js';
-import { spinner } from './ui.js';
+import { spinner, log } from './ui.js';
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export async function connectSupabase() {
   const spin = spinner('Posting secure schema job to Fabrica Connect');
@@ -9,7 +9,7 @@ export async function connectSupabase() {
   if (!response.ok) throw new Error(`Bridge rejected job: ${response.status} ${await response.text()}`);
   const job = await response.json();
   spin.succeed('Bridge job created');
-  console.log(`Open this URL if your browser does not start: ${job.connectUrl}`);
+  log(`Open this URL if your browser does not start: ${job.connectUrl}`);
   await openUrl(job.connectUrl);
   const started = Date.now();
   const poll = spinner('Waiting for Supabase authorization and project selection');

package/src/clean.js

@@ -0,0 +1,184 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import process from 'node:process';
+import { dataDir, buildsDir, readProjects } from './store.js';
+import { runCommandCapture, runCommand } from './system.js';
+import { section, endSections, kv, kvSuccess, kvFail, log, logInfo, logWarn, divider, spinner, orange, dimOrange, bold, dim, green, red, cyan } from './ui.js';
+import { choose as choosePrompt } from './prompt.js';
+
+async function pathExists(p) {
+  try { await fs.access(p); return true; } catch { return false; }
+}
+
+async function safeRm(p) {
+  try { await fs.rm(p, { recursive: true, force: true }); return true; } catch { return false; }
+}
+
+// ── clean local project data ──────────────────────────────────────────────────
+async function cleanProjectData() {
+  section('Clean local project data');
+
+  const projectsFile = path.join(dataDir, 'projects.json');
+  const projectsExist = await pathExists(projectsFile);
+  const buildsExist = await pathExists(buildsDir);
+
+  if (!projectsExist && !buildsExist) {
+    log('Nothing to clean — no local data found');
+    endSections();
+    return;
+  }
+
+  kv('Projects file', projectsExist ? projectsFile : dim('not found'));
+  kv('Builds folder', buildsExist ? buildsDir : dim('not found'));
+  logWarn('This will delete all locally tracked project records and cloned builds');
+  endSections();
+
+  const confirm = await choosePrompt(red('Are you sure you want to delete all local data?'), [
+    { name: 'Yes, delete everything', value: 'yes' },
+    { name: 'No, cancel',             value: 'no' },
+  ]);
+
+  if (confirm !== 'yes') {
+    section('Clean cancelled');
+    log('No changes made');
+    endSections();
+    return;
+  }
+
+  section('Removing local data');
+  if (projectsExist) {
+    const ok = await safeRm(projectsFile);
+    ok ? kvSuccess('projects.json', 'Deleted') : kvFail('projects.json', 'Could not delete');
+  }
+  if (buildsExist) {
+    const ok = await safeRm(buildsDir);
+    ok ? kvSuccess('builds/', 'Deleted') : kvFail('builds/', 'Could not delete');
+  }
+  log(green('Local data cleaned successfully'));
+  endSections();
+}
+
+// ── clean env files ───────────────────────────────────────────────────────────
+async function cleanEnvFiles() {
+  section('Clean .env files from local projects');
+  const projects = await readProjects();
+  const localProjects = projects.filter((p) => p.type === 'local');
+
+  if (!localProjects.length) {
+    log('No local projects found with env files');
+    endSections();
+    return;
+  }
+
+  for (const project of localProjects) {
+    const envPath = path.join(project.target, '.env.local');
+    if (await pathExists(envPath)) {
+      const ok = await safeRm(envPath);
+      ok ? kvSuccess(project.projectName, `.env.local deleted`) : kvFail(project.projectName, `Could not delete .env.local`);
+    } else {
+      log(`${project.projectName} — no .env.local found`);
+    }
+  }
+  endSections();
+}
+
+// ── logout Vercel ─────────────────────────────────────────────────────────────
+async function logoutVercel() {
+  section('Vercel logout');
+  const check = await runCommandCapture('npx', ['--yes', 'vercel@latest', 'whoami']);
+  if (check.code !== 0) {
+    log(dim('Not currently logged in to Vercel'));
+    endSections();
+    return;
+  }
+  const spin = spinner('Logging out of Vercel…');
+  const result = await runCommandCapture('npx', ['--yes', 'vercel@latest', 'logout']);
+  if (result.code === 0) spin.succeed('Logged out of Vercel');
+  else                   spin.fail('Vercel logout failed — you may need to run: npx vercel logout');
+  endSections();
+}
+
+// ── logout GitHub ─────────────────────────────────────────────────────────────
+async function logoutGitHub() {
+  section('GitHub logout');
+  const check = await runCommandCapture('gh', ['auth', 'status']);
+  if (check.code !== 0) {
+    log(dim('Not currently logged in to GitHub CLI'));
+    endSections();
+    return;
+  }
+  const spin = spinner('Logging out of GitHub CLI…');
+  const result = await runCommandCapture('gh', ['auth', 'logout', '--hostname', 'github.com']);
+  if (result.code === 0) spin.succeed('Logged out of GitHub CLI');
+  else                   spin.fail('GitHub logout failed — you may need to run: gh auth logout');
+  endSections();
+}
+
+// ── main clean command ────────────────────────────────────────────────────────
+export async function cleanCommand() {
+  section('Clean — what do you want to remove?');
+  logInfo('Choose what to clean:');
+  endSections();
+
+  const choice = await choosePrompt('Select clean mode:', [
+    { name: 'Project data    — delete local project records & cloned builds', value: 'project' },
+    { name: 'Total           — project data + env files + logout (Vercel & GitHub)',     value: 'total' },
+    { name: 'Vercel logout   — log out from Vercel CLI only',                value: 'vercel' },
+    { name: 'GitHub logout   — log out from GitHub CLI only',                value: 'github' },
+    { name: 'Cancel',                                                         value: 'cancel' },
+  ]);
+
+  if (choice === 'cancel') {
+    section('Clean');
+    log('Cancelled — no changes made');
+    endSections();
+    return;
+  }
+
+  if (choice === 'project') {
+    await cleanProjectData();
+    return;
+  }
+
+  if (choice === 'vercel') {
+    await logoutVercel();
+    return;
+  }
+
+  if (choice === 'github') {
+    await logoutGitHub();
+    return;
+  }
+
+  if (choice === 'total') {
+    section('Total clean — this will:');
+    log('1. Delete all local project records & cloned builds');
+    log('2. Delete all .env.local files from local projects');
+    log('3. Log out from Vercel CLI');
+    log('4. Log out from GitHub CLI');
+    logWarn('This is a full reset of the Fabrica CLI environment');
+    endSections();
+
+    const confirm = await choosePrompt(red('Proceed with total clean?'), [
+      { name: 'Yes, reset everything', value: 'yes' },
+      { name: 'No, cancel',            value: 'no' },
+    ]);
+
+    if (confirm !== 'yes') {
+      section('Total clean cancelled');
+      log('No changes made');
+      endSections();
+      return;
+    }
+
+    await cleanProjectData();
+    await cleanEnvFiles();
+    await logoutVercel();
+    await logoutGitHub();
+
+    section('Total clean complete');
+    log(green('All Fabrica local data and sessions have been cleared'));
+    log('Run fabrica build to start fresh');
+    endSections();
+  }
+}

package/src/cli.js

@@ -6,10 +6,11 @@ import { connectSupabase } from './bridge.js';
 import { collectEnv, cloneRepo, deployToVercel, updateProjectEnv, ensureVercelLogin, runLocally } from './deploy.js';
 import { createGithubRepoFromClone } from './github.js';
 import { ensureDependencies, vinsCommand } from './deps.js';
+import { cleanCommand } from './clean.js';
 import { BRIDGE_ORIGIN, STORE_REPO } from './config.js';
 import { dataDir, readProjects } from './store.js';
 import { choose, ask } from './prompt.js';
-import { banner, help, kv, section, subBox, resetSectionCount } from './ui.js';
+import { banner, help, kv, kvSuccess, kvFail, section, endSections, subBox, log, logInfo, logWarn, divider, stepHeader, orange, dimOrange, bold, dim, green, cyan } from './ui.js';
 import { openUrl } from './system.js';
 
 async function packageVersion() {
@@ -22,20 +23,31 @@ async function packageVersion() {
 async function build() {
   banner();
 
+  stepHeader(1, 5, 'Dependency check');
   section('Dependency check');
   await ensureDependencies({ names: ['git'] });
+  endSections();
 
-  section('Supabase Connect');
-  kv('BRIDGE', 'ONLINE');
-  kv('SQL', 'Prepared securely (hidden from UI)');
+  stepHeader(2, 5, 'Supabase connect');
+  section('Supabase connect');
+  kv('Bridge', 'ONLINE');
+  kv('SQL',    'Prepared securely (hidden from UI)');
   const supabase = await connectSupabase();
+  endSections();
+
+  stepHeader(3, 5, 'Environment variables');
   const env = await collectEnv(supabase);
+
+  stepHeader(4, 5, 'Clone storefront');
   const project = await cloneRepo();
 
-  section('Run target');
-  const target = await choose('Where should Fabrica run this storefront?', [
-    { name: 'Deploy on Vercel cloud', value: 'vercel' },
-    { name: 'Run locally on this computer', value: 'local' },
+  stepHeader(5, 5, 'Deploy target');
+  section('Where should Fabrica deploy?');
+  endSections();
+
+  const target = await choose('Select deployment target:', [
+    { name: '☁  Deploy on Vercel (cloud, shareable URL)', value: 'vercel' },
+    { name: '💻  Run locally on this computer',           value: 'local' },
   ]);
 
   if (target === 'local') {
@@ -43,164 +55,175 @@ async function build() {
     return;
   }
 
+  section('Cloud deployment — checking tools');
   await ensureDependencies({ names: ['gh', 'vercel'] });
+  endSections();
+
   await ensureVercelLogin();
   const githubRepo = await createGithubRepoFromClone(project);
   const record = await deployToVercel(project, env, githubRepo);
 
-  section('Done');
-  kv('Project', record.projectName);
-  kv('GitHub repo', record.githubRepo || 'n/a');
-  kv('URL', record.productionUrl || 'n/a');
-  kv('Path', record.target);
+  section('✓ Deployment complete');
+  divider();
+  kv('Project',    record.projectName);
+  kv('GitHub',     record.githubRepo || dim('n/a'));
+  kv('URL',        record.productionUrl || dim('n/a'));
+  kv('Local path', record.target);
+  divider();
+  log(green('Your Fabrica store is live!'));
+  endSections();
 }
 
 // ── list ──────────────────────────────────────────────────────────────────────
 async function list() {
   banner();
   const projects = await readProjects();
+
+  section('Your Fabrica projects');
   if (!projects.length) {
-    console.log('  No projects found. Run: fabrica build');
+    logInfo('No projects found');
+    log('Run: npx fabrica-e-commerce build');
+    endSections();
     return;
   }
 
-  section('Your Fabrica projects');
+  kv('Total projects', String(projects.length));
+  divider();
+  for (const p of projects) {
+    const type = p.type === 'local' ? cyan('local') : green('cloud');
+    log(`${bold(p.projectName)}  ${type}  ${dim(p.createdAt?.slice(0,10) || '')}`);
+  }
+  endSections();
+
   const choices = projects.map((p) => ({
-    name: `${p.projectName} (${p.type === 'local' ? 'local' : 'cloud'})`,
+    name: `${p.projectName}  (${p.type === 'local' ? 'local' : 'cloud'})`,
     value: p.id,
   }));
 
   const selected = await choose('Select a project to view details:', choices);
   const project = projects.find((p) => p.id === selected);
 
-  section(`Project: ${project.projectName}`);
-  const lines = [
-    `Name:       ${project.projectName}`,
-    `Type:       ${project.type === 'local' ? 'local' : 'cloud'}`,
-    `Created:    ${project.createdAt}`,
-    `Path:       ${project.target}`,
-    `GitHub:     ${project.githubRepo || 'n/a'}`,
-    `Supabase:   ${project.supabaseUrl || 'n/a'}`,
-    `URL:        ${project.productionUrl || 'n/a'}`,
-    `Env keys:   ${(project.envKeys || []).join(', ')}`,
-  ];
-  subBox(lines);
+  section(`Project: ${bold(project.projectName)}`);
+  kv('Type',      project.type === 'local' ? cyan('local') : green('cloud'));
+  kv('Created',   project.createdAt || dim('unknown'));
+  kv('Path',      project.target || dim('n/a'));
+  kv('GitHub',    project.githubRepo || dim('n/a'));
+  kv('Supabase',  project.supabaseUrl || dim('n/a'));
+  kv('URL',       project.productionUrl || dim('n/a'));
+  kv('Env keys',  (project.envKeys || []).join(', ') || dim('none'));
+  endSections();
 }
 
 // ── env ───────────────────────────────────────────────────────────────────────
 async function env() {
   banner();
   const projects = await readProjects();
+
+  section('Environment manager');
   if (!projects.length) {
-    console.log('  No projects found. Run: fabrica build');
+    logInfo('No projects found');
+    log('Run: npx fabrica-e-commerce build');
+    endSections();
     return;
   }
+  endSections();
 
-  section('Environment manager');
-
-  // Step 1 — pick project type filter
   const typeFilter = await choose('Which projects to show?', [
-    { name: 'All projects', value: 'all' },
-    { name: 'Local projects only', value: 'local' },
+    { name: 'All projects',                 value: 'all' },
+    { name: 'Local projects only',          value: 'local' },
     { name: 'Cloud (Vercel) projects only', value: 'cloud' },
   ]);
 
   const filtered = typeFilter === 'all' ? projects : projects.filter((p) => p.type === typeFilter);
   if (!filtered.length) {
-    console.log(`  No ${typeFilter} projects found.`);
+    section('Environment manager');
+    log(`No ${typeFilter} projects found`);
+    endSections();
     return;
   }
 
-  // Step 2 — pick project
   const projectId = await choose('Select project:', filtered.map((p) => ({
-    name: `${p.projectName} (${p.type === 'local' ? 'local' : 'cloud'})`,
+    name: `${p.projectName}  (${p.type === 'local' ? 'local' : 'cloud'})`,
     value: p.id,
   })));
   const project = filtered.find((p) => p.id === projectId);
 
-  // Step 3 — pick env key
   const envKeys = project.envKeys || [];
   if (!envKeys.length) {
-    console.log('  No env keys stored for this project.');
+    section('Environment manager');
+    logWarn('No env keys stored for this project');
+    endSections();
     return;
   }
 
   const key = await choose('Select env variable to update:', envKeys.map((k) => ({ name: k, value: k })));
-
-  // Step 4 — new value
   const currentVal = (project.env || {})[key];
   const value = await ask(`New value for ${key}`, currentVal || '');
 
   section('Applying update');
   await updateProjectEnv(project, key, value);
-  kv('Updated', `${key} → ${project.type === 'local' ? '.env.local' : 'Vercel + redeployed'}`);
+  kvSuccess('Updated', `${key} → ${project.type === 'local' ? '.env.local' : 'Vercel + redeployed'}`);
+  endSections();
 }
 
 // ── rerun ─────────────────────────────────────────────────────────────────────
 async function rerun() {
   banner();
   const projects = await readProjects();
+
+  section('Re-run / re-open project');
   if (!projects.length) {
-    console.log('  No projects found. Run: fabrica build');
+    logInfo('No projects found');
+    log('Run: npx fabrica-e-commerce build');
+    endSections();
     return;
   }
+  endSections();
 
-  section('Re-run / re-open project');
-
-  // Step 1 — local or cloud
   const typeFilter = await choose('Which type of project?', [
-    { name: 'All projects', value: 'all' },
-    { name: 'Local projects', value: 'local' },
-    { name: 'Cloud (Vercel) projects', value: 'cloud' },
+    { name: 'All projects',              value: 'all' },
+    { name: 'Local projects',            value: 'local' },
+    { name: 'Cloud (Vercel) projects',   value: 'cloud' },
   ]);
 
   const filtered = typeFilter === 'all' ? projects : projects.filter((p) => p.type === typeFilter);
   if (!filtered.length) {
-    console.log(`  No ${typeFilter} projects found.`);
+    section('Re-run / re-open project');
+    log(`No ${typeFilter} projects found`);
+    endSections();
     return;
   }
 
-  // Step 2 — pick project
   const projectId = await choose('Select project to re-run:', filtered.map((p) => ({
-    name: `${p.projectName} (${p.type === 'local' ? 'local' : 'cloud'})`,
+    name: `${p.projectName}  (${p.type === 'local' ? 'local' : 'cloud'})`,
     value: p.id,
   })));
   const project = filtered.find((p) => p.id === projectId);
 
-  section(`Re-running: ${project.projectName}`);
+  section(`Re-running: ${bold(project.projectName)}`);
 
   if (project.type === 'local') {
-    // Re-run local dev server
     kv('Path', project.target);
-    kv('URL', 'http://localhost:3000');
+    kv('URL',  'http://localhost:3000');
+    log('Starting dev server — browser opens in 3s…');
+    endSections();
 
-    const { runCommand } = await import('./system.js');
+    const { runCommand, runCommandCapture } = await import('./system.js');
     const { access } = await import('node:fs/promises');
     const hasPnpmLock = await access(path.join(project.target, 'pnpm-lock.yaml')).then(() => true, () => false);
-    const { runCommandCapture } = await import('./system.js');
     const pnpmAvailable = (await runCommandCapture('pnpm', ['--version'])).code === 0;
     const devCommand = hasPnpmLock && pnpmAvailable ? ['pnpm', ['run', 'dev']] : ['npm', ['run', 'dev']];
-
-    console.log('  Starting dev server... auto-opening browser in 3s');
     setTimeout(() => openUrl('http://localhost:3000'), 3000);
     await runCommand(devCommand[0], devCommand[1], { cwd: project.target });
   } else {
-    // Cloud: show info + open URL
     const url = project.productionUrl || null;
-    const lines = [
-      `Project:  ${project.projectName}`,
-      `GitHub:   ${project.githubRepo || 'n/a'}`,
-      `URL:      ${url || 'n/a'}`,
-      `Inspect:  ${project.inspectUrl || 'n/a'}`,
-      `Created:  ${project.createdAt}`,
-    ];
-    subBox(lines);
-    if (url) {
-      kv('Opening', url);
-      await openUrl(url);
-    } else {
-      console.log('  No URL found for this project.');
-    }
+    kv('GitHub',  project.githubRepo || dim('n/a'));
+    kv('URL',     url || dim('n/a'));
+    kv('Inspect', project.inspectUrl || dim('n/a'));
+    kv('Created', project.createdAt || dim('unknown'));
+    if (url) log(`Opening ${url} …`);
+    endSections();
+    if (url) await openUrl(url);
   }
 }
 
@@ -208,28 +231,29 @@ async function rerun() {
 async function info() {
   banner();
   section('Package info');
-  const lines = [
-    `Package:   fabrica-e-commerce v${await packageVersion()}`,
-    `Bridge:    ${BRIDGE_ORIGIN}`,
-    `Store repo: ${STORE_REPO}`,
-    `Local data: ${dataDir}`,
-    `Node:      ${process.version}`,
-    '',
-    'Creator:   SPARROW AI SOLUTION',
-  ];
-  subBox(lines);
+  kv('Package',    `fabrica-e-commerce v${await packageVersion()}`);
+  kv('Bridge',     BRIDGE_ORIGIN);
+  kv('Store repo', STORE_REPO);
+  kv('Local data', dataDir);
+  kv('Node.js',    process.version);
+  kv('Platform',   process.platform);
+  kv('Creator',    'SPARROW AI SOLUTION');
+  endSections();
 }
 
 // ── router ────────────────────────────────────────────────────────────────────
 export async function run(args) {
   const command = args[0] || 'help';
-  if (command === 'build')                                         return build();
-  if (command === 'list')                                          return list();
-  if (command === 'env')                                           return env();
-  if (command === 'rerun')                                         return rerun();
-  if (command === 'info'  || command === '.info')                  return info();
-  if (command === 'vins'  || command === '/vins')                  return vinsCommand();
-  if (command === 'help'  || command === '--help' || command === '-h') return help();
+
+  if (command === 'build')                                               return build();
+  if (command === 'list')                                                return list();
+  if (command === 'env')                                                 return env();
+  if (command === 'rerun')                                               return rerun();
+  if (command === 'clean')                                               return cleanCommand();
+  if (command === 'info'  || command === '.info')                        return info();
+  if (command === 'vins'  || command === '/vins')                        return vinsCommand();
+  if (command === 'help'  || command === '--help' || command === '-h')   return help();
+
   console.error(`Unknown command: ${command}`);
   help();
   process.exitCode = 1;