fabrica-e-commerce 0.1.8 → 0.1.9

package/package.json

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

package/src/github.js

@@ -1,7 +1,7 @@
 import { commandExists, runCommand, runCommandCapture } from './system.js';
 import { STORE_REPO } from './config.js';
 import { choose } from './prompt.js';
-import { kv, section, spinner } from './ui.js';
+import { dimOrange, kv, section, spinner } from './ui.js';
 
 export async function isGithubCliInstalled() {
   return commandExists('gh');
@@ -76,6 +76,31 @@ async function waitForGithubRepo(owner, repoName) {
     if (await githubRepoExists(owner, repoName)) return;
     await new Promise((resolve) => setTimeout(resolve, 2000));
   }
+  throw new Error(`Timed out waiting for ${owner}/${repoName} to appear on GitHub. GitHub forks happen asynchronously and can occasionally lag — try again in a minute, or check ${owner} on GitHub directly.`);
+}
+
+function sourceOwner() {
+  return sourceRepoFullName().split('/')[0];
+}
+
+async function isMarkedAsTemplate(repoFullName) {
+  const result = await runCommandCapture('gh', ['api', `repos/${repoFullName}`, '-q', '.is_template']);
+  return result.code === 0 && result.stdout.trim() === 'true';
+}
+
+async function createFromTemplate(spin, owner, repoName, source) {
+  if (!(await isMarkedAsTemplate(source))) {
+    spin.fail(`${source} is not marked as a "Template repository" on GitHub`);
+    throw new Error(`Creating ${owner}/${repoName} from ${source} requires ${source} to be a template repository. Go to https://github.com/${source}/settings, check "Template repository", then run "fabrica build" again.`);
+  }
+  const template = await runCommandCapture('gh', ['repo', 'create', `${owner}/${repoName}`, '--private', '--template', source, '--include-all-branches']);
+  if (template.code === 0) {
+    await waitForGithubRepo(owner, repoName);
+    spin.succeed(`Created ${owner}/${repoName} from ${source}`);
+    return repoName;
+  }
+  spin.fail('Could not create GitHub repo from source repo');
+  throw new Error(template.stderr || 'GitHub repo creation from source failed');
 }
 
 async function forkSourceRepo(owner, repoName) {
@@ -87,7 +112,18 @@ async function forkSourceRepo(owner, repoName) {
       { name: 'Stop so I can choose a different Vercel project/repo name', value: 'stop' }
     ]);
     if (action === 'stop') throw new Error(`GitHub repo ${owner}/${repoName} already exists. Re-run build with a different project name.`);
-    return;
+    return repoName;
+  }
+
+  // GitHub will not let an account fork a repository that account itself owns
+  // — not even under a different name. The Fork API still returns success
+  // (202 Accepted, since forking is asynchronous) and only fails the actual
+  // creation in the background, which previously showed up as a false "✓
+  // Forked" message followed by a 404. Skip the Fork API entirely here and go
+  // straight to template-based creation, which has no such restriction.
+  if (owner.toLowerCase() === sourceOwner().toLowerCase()) {
+    const spin = spinner(`Creating GitHub repo ${owner}/${repoName} from template ${source} (can't fork into the same account that owns ${source})`);
+    return createFromTemplate(spin, owner, repoName, source);
   }
 
   const spin = spinner(`Creating GitHub repo ${owner}/${repoName} from ${source}`);
@@ -95,27 +131,49 @@ async function forkSourceRepo(owner, repoName) {
     input: JSON.stringify({ name: repoName, default_branch_only: false })
   });
   if (fork.code === 0) {
-    await waitForGithubRepo(owner, repoName);
-    spin.succeed(`Forked ${source} to ${owner}/${repoName}`);
-    return;
-  }
+    // The fork API can also return success while pointing at a DIFFERENT repo
+    // than the one we asked for — e.g. if this account already has a fork of
+    // `source` under another name, GitHub returns that existing fork and
+    // silently ignores the requested "name". Read the actual name back from
+    // the API response instead of assuming it matched.
+    let actualName = repoName;
+    try {
+      const data = JSON.parse(fork.stdout);
+      if (data?.name) actualName = data.name;
+    } catch {
+      // Response wasn't parseable JSON; fall back to assuming the requested
+      // name was honored and let waitForGithubRepo confirm or throw below.
+    }
 
-  const template = await runCommandCapture('gh', ['repo', 'create', `${owner}/${repoName}`, '--private', '--template', source, '--include-all-branches']);
-  if (template.code === 0) {
-    spin.succeed(`Created ${owner}/${repoName} from ${source}`);
-    return;
+    await waitForGithubRepo(owner, actualName);
+
+    if (actualName !== repoName) {
+      const renameSpin = spinner(`Renaming ${owner}/${actualName} to ${owner}/${repoName}`);
+      const rename = await runCommandCapture('gh', ['api', `repos/${owner}/${actualName}`, '--method', 'PATCH', '-f', `name=${repoName}`]);
+      if (rename.code === 0) {
+        await waitForGithubRepo(owner, repoName);
+        renameSpin.succeed(`Forked ${source} to ${owner}/${repoName} (GitHub had reused an existing fork named ${actualName})`);
+        return repoName;
+      }
+      renameSpin.fail(`Could not rename — continuing with the existing fork name`);
+      kv('GitHub repo', `https://github.com/${owner}/${actualName}`);
+      console.log(dimOrange(`  Note: this is named "${actualName}", not "${repoName}", because your GitHub account already had a fork of ${source}.`));
+      return actualName;
+    }
+
+    spin.succeed(`Forked ${source} to ${owner}/${repoName}`);
+    return repoName;
   }
 
-  spin.fail('Could not create GitHub repo from source repo');
-  throw new Error(fork.stderr || template.stderr || 'GitHub repo creation from source failed');
+  return createFromTemplate(spin, owner, repoName, source);
 }
 
 export async function createGithubRepoFromClone(project) {
   section('GitHub repository');
   await ensureGithubLogin();
   const owner = await getGithubLogin();
-  const repoName = project.projectName;
-  await forkSourceRepo(owner, repoName);
+  const requestedName = project.projectName;
+  const repoName = await forkSourceRepo(owner, requestedName);
 
   const browserUrl = `https://github.com/${owner}/${repoName}`;
   const cloneUrl = `${browserUrl}.git`;