@cellajs/create-cella 0.3.1 → 0.3.3

package/README.md

@@ -1,23 +1,12 @@
 # @cellajs/create-cella
 
-CLI tool to scaffold a new Cella project from the template.
-
-## Overview
-
-This CLI creates a new Cella project by downloading the latest template, scaffolding your project, and configuring git with upstream tracking for future syncs. It runs no shell commands and requires no `git` binary — git operations use [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git) and the template is fetched and extracted in-process.
+CLI tool to scaffold a new Cella project from [the template](https://github.com/cellajs/cella).
 
 ## Usage
 
 ```bash
 pnpm create @cellajs/cella my-app
 ```
-
-Running without arguments starts interactive mode, prompting for:
-
-1. **Project name** – Directory name and package name
-2. **New branch** – Optionally create a dev branch alongside `main`
-3. **Directory conflict** – If target exists, choose to cancel or continue
-
 ## CLI Options
 
 ```bash
@@ -34,14 +23,12 @@ pnpm create @cellajs/cella [directory] [options]
 
 ## What It Does
 
-1. Downloads the latest Cella template as a GitHub tarball and extracts it in-process (no `git` binary, no shell)
-2. Cleans template files (removes cella-specific docs, configs) and interpolates the project config
+1. Downloads the latest Cella template as a GitHub tarball and extracts it in-process
+2. Cleans template files to replace cella-specific config
 3. Initializes a git repository with an initial commit via isomorphic-git
 4. Creates an optional working branch
 5. Adds Cella as the upstream remote for future syncs
 
-Dependency installation and migration generation are **not** run automatically — after scaffolding, run `pnpm install`, then `pnpm generate` (the CLI prints these next steps on success).
-
 ## Development
 
 ```bash

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/create-cella-cli.ts
 import { existsSync as existsSync2 } from "fs";
+import { rm as rm3 } from "fs/promises";
 import { basename as basename2, resolve as resolve3 } from "path";
 import { input, select } from "@inquirer/prompts";
 import pc6 from "picocolors";
@@ -12,7 +13,7 @@ import pc from "picocolors";
 // package.json
 var package_default = {
   name: "@cellajs/create-cella",
-  version: "0.3.1",
+  version: "0.3.3",
   private: false,
   license: "MIT",
   description: "Cella is a TypeScript template to create web apps with sync and offline capabilities.",
@@ -31,7 +32,6 @@ var package_default = {
   type: "module",
   main: "./dist/index.js",
   files: [
-    "configs",
     "dist",
     "index.js",
     "README.md"
@@ -63,7 +63,6 @@ var package_default = {
     commander: "^15.0.0",
     ignore: "^7.0.5",
     "isomorphic-git": "^1.38.5",
-    nanotar: "^0.3.0",
     ora: "^9.4.1",
     picocolors: "^1.1.1",
     "validate-npm-package-name": "^8.0.0"
@@ -114,23 +113,25 @@ var NAME = "create cella";
 var DIVIDER = "\u2500".repeat(60);
 var TEMPLATE_URL = "github:cellajs/cella";
 var CELLA_REMOTE_URL = "git@github.com:cellajs/cella.git";
+var CELLA_REMOTE_NAME = "cella-upstream";
 var DESCRIPTION = package_default.description;
 var VERSION = package_default.version;
 var WEBSITE = package_default.homepage;
-function getHeaderLine(templateVersion) {
-  const leftText = `\u29C8 ${NAME} \xB7 ${VERSION} \xB7 cella ${templateVersion}`;
-  const left = `${pc.cyan(`\u29C8 ${NAME}`)} ${pc.dim(`\xB7 ${VERSION} \xB7 cella ${templateVersion}`)}`;
+function getHeaderLine() {
+  const leftText = `\u29C8 ${NAME} \xB7 ${VERSION}`;
+  const left = `${pc.cyan(`\u29C8 ${NAME}`)} ${pc.dim(`\xB7 ${VERSION}`)}`;
   const right = pc.cyan(WEBSITE);
   const padding = Math.max(1, 60 - leftText.length - WEBSITE.length);
   return `${left}${" ".repeat(padding)}${right}`;
 }
-var TO_REMOVE = ["./cli/create", "./info/QUICKSTART.md"];
+var TO_REMOVE = ["./cli/create", "./info/QUICKSTART.md", "./infra/Pulumi.production.yaml"];
 var TO_CLEAN = ["./backend/drizzle"];
 var TO_COPY = {
   "./frontend/.env.example": "./frontend/.env",
   "./info/QUICKSTART.md": "README.md"
 };
-var PLACEHOLDER_CONFIG = "configs/default-config.ts.template";
+var PLACEHOLDER_CONFIG = "shared/config/config.template.ts";
+var INITIAL_VERSION = "0.0.0";
 async function generateEnvFromExample(examplePath, replacements) {
   const { readFile: readFile4 } = await import("fs/promises");
   let content;
@@ -220,8 +221,8 @@ ${nameEntry}${body}
 
 // src/create.ts
 import { existsSync } from "fs";
-import { cp, mkdir as mkdir2, rm } from "fs/promises";
-import { dirname as dirname3, isAbsolute, join as join4, relative as relative2, resolve as resolve2 } from "path";
+import { cp, mkdir as mkdir2, rm as rm2 } from "fs/promises";
+import { dirname as dirname2, isAbsolute, join as join5, relative as relative2, resolve as resolve2 } from "path";
 import { checkbox } from "@inquirer/prompts";
 import pc5 from "picocolors";
 
@@ -255,7 +256,7 @@ async function gitRemoteRemove(repoPath, remoteName) {
 async function addRemote({
   targetFolder,
   remoteUrl = CELLA_REMOTE_URL,
-  remoteName = "upstream",
+  remoteName = CELLA_REMOTE_NAME,
   silent = false
 }) {
   try {
@@ -338,13 +339,13 @@ function showAscii() {
   console.info(pc2.cyan("\u2592\u2593\u2588   \u2588\u2593\u2592   | (_|  __/ | | (_| |     "));
   console.info(pc2.cyan("\u2592\u2593\u2588\u2588\u2588\u2588\u2588\u2593\u2592    \\___\\___|_|_|\\__,_|  "));
 }
-function showWelcome(templateVersion) {
+function showWelcome() {
   console.info();
   showAscii();
   console.info();
   console.info(pc2.dim(DESCRIPTION));
   console.info();
-  console.info(getHeaderLine(templateVersion));
+  console.info(getHeaderLine());
   console.info(DIVIDER);
 }
 function confirmChoice(label, value) {
@@ -375,21 +376,8 @@ function showSuccess(projectName, _targetFolder, relativePath, needsCd, packageM
 // src/utils/clean-template.ts
 import fs2 from "fs/promises";
 import path from "path";
-import { fileURLToPath } from "url";
 import pc3 from "picocolors";
 var warningMark = pc3.yellow("\u26A0");
-async function resolvePlaceholderConfigPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  const candidates = [path.resolve(here, "../..", PLACEHOLDER_CONFIG), path.resolve(here, "..", PLACEHOLDER_CONFIG)];
-  for (const candidate of candidates) {
-    try {
-      await fs2.access(candidate);
-      return candidate;
-    } catch {
-    }
-  }
-  return candidates[0];
-}
 async function cleanTemplate({
   targetFolder,
   projectName,
@@ -408,7 +396,8 @@ async function cleanTemplate({
           const destAbsolutePath = path.resolve(targetFolder, dest);
           await copyFile(srcAbsolutePath, destAbsolutePath);
         }
-        await applyPlaceholderConfig(targetFolder, projectName);
+        await applyPlaceholderConfig(targetFolder, projectName, displayName);
+        await resetReleaseState(targetFolder, projectName);
         const backendReplacements = getBackendEnvReplacements(projectName, adminEmail, portOffset);
         const backendEnv = await generateEnvFromExample(
           path.resolve(targetFolder, "backend/.env.example"),
@@ -443,18 +432,14 @@ async function cleanTemplate({
   });
 }
 async function removeFolderContents(folderPath) {
-  const files = await fs2.readdir(folderPath);
-  await Promise.all(
-    files.map(async (file) => {
-      const filePath = path.join(folderPath, file);
-      const stat = await fs2.lstat(filePath);
-      if (stat.isDirectory()) {
-        await fs2.rm(filePath, { recursive: true, force: true });
-      } else {
-        await fs2.rm(filePath);
-      }
-    })
-  );
+  let files;
+  try {
+    files = await fs2.readdir(folderPath);
+  } catch (err) {
+    if (err.code === "ENOENT") return;
+    throw err;
+  }
+  await Promise.all(files.map((file) => fs2.rm(path.join(folderPath, file), { recursive: true, force: true })));
 }
 async function removeFileOrFolder(pathToRemove) {
   await fs2.rm(pathToRemove, { recursive: true, force: true });
@@ -473,29 +458,72 @@ ${warningMark} Source file "${src}" does not exist > Skip copy`);
     }
   }
 }
-async function applyPlaceholderConfig(targetFolder, projectName) {
-  const displayName = projectName.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
-  const src = await resolvePlaceholderConfigPath();
+async function applyPlaceholderConfig(targetFolder, projectName, displayName) {
+  const src = path.resolve(targetFolder, PLACEHOLDER_CONFIG);
   const dest = path.resolve(targetFolder, "./shared/config/config.default.ts");
   try {
     let content = await fs2.readFile(src, "utf8");
     content = content.replaceAll("__project_name__", displayName);
     content = content.replaceAll("__project_slug__", projectName);
     await fs2.writeFile(dest, content, "utf8");
+    await fs2.rm(src, { force: true });
   } catch (err) {
     if (err.code === "ENOENT") {
       console.info(`
-${warningMark} Placeholder config "${src}" not found > Skip`);
+${warningMark} Fork config template "${src}" not found > Skip`);
     } else {
       throw err;
     }
   }
 }
+async function resetReleaseState(targetFolder, projectName) {
+  const pkgPath = path.resolve(targetFolder, "package.json");
+  try {
+    let pkg = await fs2.readFile(pkgPath, "utf8");
+    pkg = pkg.replace(/^(\s*"name":\s*)"[^"]*"/m, `$1"${projectName}"`);
+    pkg = pkg.replace(/^(\s*"version":\s*)"[^"]*"/m, `$1"${INITIAL_VERSION}"`);
+    for (const field of ["license", "repository", "description", "author", "homepage"]) {
+      pkg = pkg.replace(new RegExp(`^(\\s*"${field}":\\s*)"[^"]*"`, "m"), '$1""');
+    }
+    pkg = pkg.replace(/^(\s*"keywords":\s*)\[[^\]]*\]/m, "$1[]");
+    await fs2.writeFile(pkgPath, pkg, "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      console.info(`
+${warningMark} "package.json" not found > Skip version reset`);
+    } else {
+      throw err;
+    }
+  }
+  const configPath = path.resolve(targetFolder, ".github/release-please-config.json");
+  try {
+    const config = await fs2.readFile(configPath, "utf8");
+    await fs2.writeFile(configPath, config.replaceAll("info/CHANGELOG.md", "CHANGELOG.md"), "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      console.info(`
+${warningMark} "release-please-config.json" not found > Skip changelog path reset`);
+    } else {
+      throw err;
+    }
+  }
+  await fs2.writeFile(
+    path.resolve(targetFolder, ".github/release-please-manifest.json"),
+    `{
+  ".": "${INITIAL_VERSION}"
+}
+`,
+    "utf8"
+  );
+  await fs2.writeFile(path.resolve(targetFolder, "CHANGELOG.md"), "# Changelog\n", "utf8");
+}
 
 // src/utils/download-template.ts
-import { mkdir, writeFile } from "fs/promises";
-import { dirname, join } from "path";
-import { parseTarGzip } from "nanotar";
+import fs3 from "fs";
+import { rm } from "fs/promises";
+import { join } from "path";
+import git2 from "isomorphic-git";
+import http from "isomorphic-git/http/node";
 function parseGithubRepo(template) {
   const [owner, repo] = template.replace(/^github:/, "").split("/");
   if (!owner || !repo) {
@@ -505,22 +533,11 @@ function parseGithubRepo(template) {
 }
 async function downloadGithubTemplate(template, ref, targetFolder) {
   const { owner, repo } = parseGithubRepo(template);
-  const url = `https://codeload.github.com/${owner}/${repo}/tar.gz/${ref}`;
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`Failed to download template ${owner}/${repo}@${ref}: ${response.status} ${response.statusText}`);
-  }
-  const archive = new Uint8Array(await response.arrayBuffer());
-  const entries = await parseTarGzip(archive);
-  for (const entry of entries) {
-    if (entry.type !== "file" || !entry.data) continue;
-    const relativePath = entry.name.replace(/^[^/]+\//, "");
-    if (!relativePath) continue;
-    const dest = join(targetFolder, relativePath);
-    await mkdir(dirname(dest), { recursive: true });
-    const mode = entry.attrs?.mode ? Number.parseInt(entry.attrs.mode, 8) : void 0;
-    await writeFile(dest, entry.data, mode ? { mode } : void 0);
-  }
+  const url = `https://github.com/${owner}/${repo}.git`;
+  await git2.clone({ fs: fs3, http, dir: targetFolder, url, ref, singleBranch: true, depth: 1 });
+  const baseSha = await git2.resolveRef({ fs: fs3, dir: targetFolder, ref: "HEAD" });
+  await rm(join(targetFolder, ".git"), { recursive: true, force: true });
+  return baseSha;
 }
 
 // src/utils/list-template-files.ts
@@ -605,7 +622,7 @@ function createProgress(title, silent = false) {
 
 // src/utils/scan-optional-modules.ts
 import { readdir as readdir2, readFile as readFile2 } from "fs/promises";
-import { dirname as dirname2, join as join3, relative } from "path";
+import { dirname, join as join3, relative } from "path";
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", ".turbo", "coverage"]);
 async function scanOptionalModules(targetFolder) {
   const files = [];
@@ -617,7 +634,7 @@ async function scanOptionalModules(targetFolder) {
     const name = src.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
     const description = src.match(/description:\s*['"]([^'"]+)['"]/)?.[1] ?? "";
     if (!name) continue;
-    modules.push({ name, description, folder: relative(targetFolder, dirname2(file)) });
+    modules.push({ name, description, folder: relative(targetFolder, dirname(file)) });
   }
   return modules.sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -643,6 +660,21 @@ async function collectModuleFiles(dir, out) {
   }
 }
 
+// src/utils/write-scaffold-base.ts
+import { mkdir, writeFile } from "fs/promises";
+import { join as join4 } from "path";
+var CELLA_DIR = ".cella";
+var BASE_FILE = "base";
+async function writeScaffoldBase(targetFolder, sha) {
+  const dir = join4(targetFolder, CELLA_DIR);
+  await mkdir(dir, { recursive: true });
+  const contents = `# Upstream cella commit this project was scaffolded from (create-cella).
+# Used by \`pnpm cella sync\` to bootstrap the first merge-base. Do not edit or delete.
+${sha}
+`;
+  await writeFile(join4(dir, BASE_FILE), contents, "utf8");
+}
+
 // src/create.ts
 function isLocalPath(path2) {
   return path2.startsWith("/") || path2.startsWith("./") || path2.startsWith("../");
@@ -668,6 +700,7 @@ async function create({
     progress.step("creating project folder");
     await mkdir2(targetFolder, { recursive: true });
     process.chdir(targetFolder);
+    let baseSha = null;
     if (isLocalTemplate) {
       progress.step("copying local template");
       const sourcePath = resolve2(originalCwd, templateUrl);
@@ -681,22 +714,23 @@ async function create({
       }
       const tracked = await listTemplateFiles(sourcePath);
       for (const rel2 of tracked) {
-        const src = join4(sourcePath, rel2);
+        const src = join5(sourcePath, rel2);
         if (!existsSync(src)) continue;
-        const dest = join4(targetFolder, rel2);
-        await mkdir2(dirname3(dest), { recursive: true });
+        const dest = join5(targetFolder, rel2);
+        await mkdir2(dirname2(dest), { recursive: true });
         await cp(src, dest);
       }
     } else {
       const ref = templateRef ?? "main";
       progress.step(`downloading cella template${templateRef ? ` (${templateRef})` : ""}`);
-      await downloadGithubTemplate(template, ref, targetFolder);
+      baseSha = await downloadGithubTemplate(template, ref, targetFolder);
     }
     if (!silent) await promptOptionalModules(targetFolder);
     progress.step("cleaning template");
     const displayName = projectName.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
     await cleanTemplate({ targetFolder, projectName, displayName, portOffset, adminEmail });
-    const gitFolderPath = join4(targetFolder, ".git");
+    if (baseSha) await writeScaffoldBase(targetFolder, baseSha);
+    const gitFolderPath = join5(targetFolder, ".git");
     if (!shouldSkipStep("git") && !existsSync(gitFolderPath)) {
       progress.step("initializing git");
       await gitInit(targetFolder);
@@ -741,14 +775,14 @@ async function promptOptionalModules(targetFolder) {
   confirmChoice("Optional modules", keep.length ? keep.join(", ") : pc5.dim("none"));
   resumeSpinner();
   const folders = modules.filter((m) => !keep.includes(m.name)).flatMap(optionalModuleFolders);
-  await Promise.all(folders.map((f) => rm(join4(targetFolder, f), { recursive: true, force: true })));
+  await Promise.all(folders.map((f) => rm2(join5(targetFolder, f), { recursive: true, force: true })));
 }
 
 // src/utils/detect-used-ports.ts
 import { readdir as readdir3, readFile as readFile3 } from "fs/promises";
-import { dirname as dirname4, join as join5 } from "path";
+import { dirname as dirname3, join as join6 } from "path";
 async function detectUsedPorts(targetFolder) {
-  const parentDir = dirname4(targetFolder);
+  const parentDir = dirname3(targetFolder);
   const used = [];
   let siblings;
   try {
@@ -757,7 +791,7 @@ async function detectUsedPorts(targetFolder) {
     return used;
   }
   for (const name of siblings) {
-    const configPath = join5(parentDir, name, "shared/config/config.development.ts");
+    const configPath = join6(parentDir, name, "shared/config/config.development.ts");
     try {
       const content = await readFile3(configPath, "utf8");
       const feMatch = content.match(/frontendUrl:\s*'http:\/\/localhost:(\d+)'/);
@@ -785,22 +819,6 @@ function findNextOffset(usedPorts) {
   return 0;
 }
 
-// src/utils/extract-package-json-version-from-uri.ts
-async function extractPackageJsonVersionFromUri(repositoryUrl, branch = "main") {
-  const [owner, repo] = repositoryUrl.replace("github:", "").split("/");
-  const apiUrl = `https://api.github.com/repos/${owner}/${repo}/contents/package.json?ref=${branch}`;
-  try {
-    const response = await fetch(apiUrl, {
-      headers: { Accept: "application/vnd.github.raw+json" }
-    });
-    if (!response.ok) return "unknown";
-    const packageJson = await response.json();
-    return packageJson.version || "unknown";
-  } catch {
-    return "unknown";
-  }
-}
-
 // src/utils/fetch-template-metadata.ts
 function parseRepo(repositoryUrl) {
   const [owner, repo] = repositoryUrl.replace("github:", "").split("/");
@@ -817,7 +835,7 @@ async function fetchLatestRelease(repositoryUrl) {
     const response = await fetch(apiUrl, { headers: GITHUB_HEADERS });
     if (!response.ok) return null;
     const releases = await response.json();
-    const release = releases.find((r) => !r.draft && !r.prerelease && /^v\d/.test(r.tag_name ?? ""));
+    const release = releases.find((r) => !r.draft && !r.prerelease && /^v?\d/.test(r.tag_name ?? ""));
     if (!release?.tag_name) return null;
     return { tag: release.tag_name, date: toDate(release.published_at) };
   } catch {
@@ -848,8 +866,7 @@ async function isEmptyDirectory(path2) {
 
 // src/create-cella-cli.ts
 async function main() {
-  const templateVersion = await extractPackageJsonVersionFromUri(TEMPLATE_URL);
-  showWelcome(templateVersion);
+  showWelcome();
   const promptTheme = { prefix: "", style: { answer: (text) => text } };
   const promptContext = { clearPromptOnDone: true };
   const templateRef = cli.options.template ? void 0 : await promptTemplateRef(promptTheme, promptContext);
@@ -878,7 +895,7 @@ async function main() {
         theme: promptTheme,
         choices: [
           { name: "Cancel and exit", value: "cancel" },
-          { name: "Ignore existing files and continue", value: "ignore" }
+          { name: "Remove existing files and continue", value: "remove" }
         ]
       },
       promptContext
@@ -886,6 +903,9 @@ async function main() {
     if (action === "cancel") {
       process.exit(1);
     }
+    if (action === "remove") {
+      await rm3(targetFolder, { recursive: true, force: true });
+    }
   }
   const portOffset = cli.options.portOffset ?? await promptPortOffset(targetFolder, promptTheme, promptContext);
   confirmChoice("Port offset", formatOffset(portOffset));
@@ -925,8 +945,12 @@ async function promptTemplateRef(theme, context) {
     console.info(`  ${pc6.gray(`https://github.com/${repo}/commit/${commit.sha}`)}`);
   }
   console.info();
-  if (!release) return commit?.sha;
+  if (!release) return "main";
   if (!commit) return release.tag;
+  if (!process.stdin.isTTY) {
+    confirmChoice("Latest release", release.tag);
+    return release.tag;
+  }
   const choice = await select(
     {
       message: "Start from",
@@ -943,7 +967,7 @@ async function promptTemplateRef(theme, context) {
     return release.tag;
   }
   confirmChoice("Latest commit", commit.shortSha);
-  return commit.sha;
+  return "main";
 }
 function formatOffset(o, suffix = "") {
   return `${o} \u2192 :${3e3 + o} / :${4e3 + o} / :${5432 + o}${suffix}`;