fabrica-e-commerce 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabrica-e-commerce",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Orange themed CMD launcher for deploying Fabrica e-commerce stores with Supabase and Vercel.",
   "type": "module",
   "bin": {

package/src/deps.js

@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import process from 'node:process';
 import { commandExists, runCommand, runCommandCapture } from './system.js';
 import { kv, section, spinner } from './ui.js';
@@ -23,14 +25,14 @@ const DEPENDENCIES = [
   {
     name: 'git',
     label: 'Git',
-    check: () => commandExists('git'),
+    check: () => checkWithPathRefresh('git'),
     install: installGit,
     manualUrl: 'https://git-scm.com/downloads'
   },
   {
     name: 'gh',
     label: 'GitHub CLI (gh)',
-    check: () => commandExists('gh'),
+    check: () => checkWithPathRefresh('gh'),
     install: installGithubCli,
     manualUrl: 'https://github.com/cli/cli#installation'
   },
@@ -43,18 +45,69 @@ const DEPENDENCIES = [
   }
 ];
 
+
+function addToPathIfDirectory(directory) {
+  if (!directory || !fs.existsSync(directory)) return;
+  const delimiter = path.delimiter;
+  const current = process.env.PATH || '';
+  const entries = current.split(delimiter).filter(Boolean);
+  if (!entries.some((entry) => entry.toLowerCase() === directory.toLowerCase())) {
+    process.env.PATH = `${directory}${delimiter}${current}`;
+  }
+}
+
+function refreshWindowsToolPaths() {
+  if (process.platform !== 'win32') return;
+  const localAppData = process.env.LOCALAPPDATA;
+  const programFiles = process.env.ProgramFiles;
+  const programFilesX86 = process.env['ProgramFiles(x86)'];
+  const programData = process.env.ProgramData;
+  addToPathIfDirectory(localAppData && path.join(localAppData, 'Microsoft', 'WinGet', 'Links'));
+  addToPathIfDirectory(programFiles && path.join(programFiles, 'GitHub CLI'));
+  addToPathIfDirectory(programFilesX86 && path.join(programFilesX86, 'GitHub CLI'));
+  addToPathIfDirectory(programData && path.join(programData, 'chocolatey', 'bin'));
+  addToPathIfDirectory(programFiles && path.join(programFiles, 'Git', 'cmd'));
+  addToPathIfDirectory(programFiles && path.join(programFiles, 'nodejs'));
+}
+
+async function checkWithPathRefresh(command) {
+  refreshWindowsToolPaths();
+  return commandExists(command);
+}
+
+async function runFirstSuccessful(candidates, options = {}) {
+  for (const [command, args] of candidates) {
+    const result = await runCommandCapture(command, args, options);
+    if (result.code === 0) return result;
+  }
+  return { code: 1, stdout: '', stderr: 'All fallback commands failed' };
+}
+
 async function checkVercelCli() {
-  const result = await runCommandCapture('npx', ['--yes', 'vercel@latest', '--version']);
+  refreshWindowsToolPaths();
+  const result = await runFirstSuccessful([
+    ['npx', ['--yes', 'vercel@latest', '--version']],
+    ['npm', ['exec', '--yes', 'vercel@latest', '--', '--version']],
+    ['vercel', ['--version']]
+  ]);
   return result.code === 0;
 }
 
 async function warmVercelCli() {
-  // npx fetches vercel on first use, so "installing" it just means priming
-  // the npm cache once so later `build`/`list` calls are instant.
-  await runCommand('npx', ['--yes', 'vercel@latest', '--version'], { allowFailure: true });
+  refreshWindowsToolPaths();
+  const warmed = await runFirstSuccessful([
+    ['npx', ['--yes', 'vercel@latest', '--version']],
+    ['npm', ['exec', '--yes', 'vercel@latest', '--', '--version']],
+    ['vercel', ['--version']]
+  ]);
+  if (warmed.code === 0) return;
+  // Last resort: install a global Vercel binary so future invocations have a
+  // real `vercel` executable even when npx/npm exec cannot launch correctly.
+  await runCommand('npm', ['install', '-g', 'vercel@latest'], { allowFailure: true });
 }
 
 async function installGit() {
+  refreshWindowsToolPaths();
   const platform = process.platform;
   if (platform === 'linux') {
     if (await commandExists('apt-get')) {
@@ -70,12 +123,21 @@ async function installGit() {
     if (await commandExists('brew')) return runCommand('brew', ['install', 'git'], { allowFailure: true });
   }
   if (platform === 'win32') {
-    if (await commandExists('winget')) return runCommand('winget', ['install', '--id', 'Git.Git', '-e', '--source', 'winget'], { allowFailure: true });
-    if (await commandExists('choco')) return runCommand('choco', ['install', 'git', '-y'], { allowFailure: true });
+    if (await commandExists('winget')) {
+      await runCommand('winget', ['install', '--id', 'Git.Git', '-e', '--source', 'winget'], { allowFailure: true });
+      refreshWindowsToolPaths();
+      return;
+    }
+    if (await commandExists('choco')) {
+      await runCommand('choco', ['install', 'git', '-y'], { allowFailure: true });
+      refreshWindowsToolPaths();
+      return;
+    }
   }
 }
 
 async function installGithubCli() {
+  refreshWindowsToolPaths();
   const platform = process.platform;
   if (platform === 'linux') {
     if (await commandExists('apt-get')) {
@@ -107,8 +169,16 @@ async function installGithubCli() {
     if (await commandExists('brew')) return runCommand('brew', ['install', 'gh'], { allowFailure: true });
   }
   if (platform === 'win32') {
-    if (await commandExists('winget')) return runCommand('winget', ['install', '--id', 'GitHub.cli', '-e', '--source', 'winget'], { allowFailure: true });
-    if (await commandExists('choco')) return runCommand('choco', ['install', 'gh', '-y'], { allowFailure: true });
+    if (await commandExists('winget')) {
+      await runCommand('winget', ['install', '--id', 'GitHub.cli', '-e', '--source', 'winget'], { allowFailure: true });
+      refreshWindowsToolPaths();
+      return;
+    }
+    if (await commandExists('choco')) {
+      await runCommand('choco', ['install', 'gh', '-y'], { allowFailure: true });
+      refreshWindowsToolPaths();
+      return;
+    }
   }
 }
 

package/src/system.js

@@ -7,13 +7,22 @@ function executable(command) {
   return command;
 }
 
+function spawnOptions(options = {}, stdio) {
+  return {
+    stdio,
+    // Windows package-manager shims such as npm.cmd/npx.cmd can throw
+    // `spawn EINVAL` when launched directly from some terminals. Running
+    // through the platform shell preserves Unix behavior while making those
+    // Windows shim commands reliable.
+    shell: process.platform === 'win32',
+    cwd: options.cwd,
+    env: options.env || process.env
+  };
+}
+
 export function runCommand(command, args, options = {}) {
   return new Promise((resolve, reject) => {
-    const child = spawn(executable(command), args, {
-      stdio: options.input ? ['pipe', 'inherit', 'inherit'] : 'inherit',
-      shell: false,
-      cwd: options.cwd
-    });
+    const child = spawn(executable(command), args, spawnOptions(options, options.input ? ['pipe', 'inherit', 'inherit'] : 'inherit'));
     if (options.input) child.stdin.end(options.input);
     child.on('error', (error) => {
       if (options.allowFailure) resolve();
@@ -31,11 +40,7 @@ export function runCommandCapture(command, args, options = {}) {
   return new Promise((resolve) => {
     let child;
     try {
-      child = spawn(executable(command), args, {
-        stdio: 'pipe',
-        shell: false,
-        cwd: options.cwd
-      });
+      child = spawn(executable(command), args, spawnOptions(options, 'pipe'));
     } catch (error) {
       resolve({ code: null, stdout: '', stderr: '', error });
       return;