@percepta/create 3.0.0 → 3.0.1

package/dist/index.js

@@ -17,10 +17,9 @@ import {
 import { program } from "commander";
 
 // src/commands/create.ts
-import path4 from "path";
+import path6 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { randomBytes } from "crypto";
-import fs4 from "fs-extra";
+import fs6 from "fs-extra";
 import chalk from "chalk";
 import ora from "ora";
 import { execSync, spawn } from "child_process";
@@ -255,10 +254,50 @@ async function detectMonorepo(startDir) {
   return NOT_FOUND;
 }
 
+// src/utils/env-local.ts
+import path4 from "path";
+import { randomBytes } from "crypto";
+import fs4 from "fs-extra";
+async function generateEnvLocal(packageDir) {
+  const examplePath = path4.join(packageDir, ".env.example");
+  const localPath = path4.join(packageDir, ".env.local");
+  if (!await fs4.pathExists(examplePath)) return;
+  if (await fs4.pathExists(localPath)) return;
+  const authSecret = randomBytes(32).toString("base64");
+  const encKey = randomBytes(16).toString("hex");
+  const content = (await fs4.readFile(examplePath, "utf-8")).replace(/^BETTER_AUTH_SECRET=.*$/m, `BETTER_AUTH_SECRET=${authSecret}`).replace(/^ENCRYPTION_SECRET_KEY=.*$/m, `ENCRYPTION_SECRET_KEY=${encKey}`);
+  await fs4.writeFile(localPath, content);
+}
+
+// src/utils/relocate-workflows.ts
+import path5 from "path";
+import fs5 from "fs-extra";
+async function relocateWorkflowsToRoot(packageDir, monorepoRoot, appName) {
+  const sourceDir = path5.join(packageDir, ".github", "workflows");
+  if (!await fs5.pathExists(sourceDir)) return;
+  const targetDir = path5.join(monorepoRoot, ".github", "workflows");
+  await fs5.ensureDir(targetDir);
+  const entries = await fs5.readdir(sourceDir);
+  for (const name of entries) {
+    if (!name.startsWith(`${appName}-`)) continue;
+    if (!/\.(ya?ml)$/.test(name)) continue;
+    await fs5.move(path5.join(sourceDir, name), path5.join(targetDir, name), {
+      overwrite: true
+    });
+  }
+  if ((await fs5.readdir(sourceDir)).length === 0) {
+    await fs5.rmdir(sourceDir);
+    const packageGithub = path5.join(packageDir, ".github");
+    if ((await fs5.readdir(packageGithub)).length === 0) {
+      await fs5.rmdir(packageGithub);
+    }
+  }
+}
+
 // src/commands/create.ts
 var PACKAGE_MANAGER = "pnpm";
 function shPath(p) {
-  return p.split(path4.sep).join("/");
+  return p.split(path6.sep).join("/");
 }
 function runPackageManagerInstall(packageManager, cwd) {
   return new Promise((resolve, reject) => {
@@ -376,48 +415,17 @@ async function autoRunWebapp(packageDir) {
   return true;
 }
 function readTemplateVersions() {
-  const versionsPath = path4.resolve(
-    path4.dirname(fileURLToPath2(import.meta.url)),
+  const versionsPath = path6.resolve(
+    path6.dirname(fileURLToPath2(import.meta.url)),
     "../template-versions.json"
   );
   try {
-    const content = fs4.readFileSync(versionsPath, "utf-8");
+    const content = fs6.readFileSync(versionsPath, "utf-8");
     return JSON.parse(content);
   } catch {
     return {};
   }
 }
-async function generateEnvLocal(packageDir) {
-  const examplePath = path4.join(packageDir, ".env.example");
-  const localPath = path4.join(packageDir, ".env.local");
-  if (!await fs4.pathExists(examplePath)) return;
-  if (await fs4.pathExists(localPath)) return;
-  const authSecret = randomBytes(32).toString("base64");
-  const encKey = randomBytes(16).toString("hex");
-  const content = (await fs4.readFile(examplePath, "utf-8")).replace(/^BETTER_AUTH_SECRET=.*$/m, `BETTER_AUTH_SECRET=${authSecret}`).replace(/^ENCRYPTION_SECRET_KEY=.*$/m, `ENCRYPTION_SECRET_KEY=${encKey}`);
-  await fs4.writeFile(localPath, content);
-}
-async function relocateWorkflowsToRoot(packageDir, monorepoRoot, appName) {
-  const sourceDir = path4.join(packageDir, ".github", "workflows");
-  if (!await fs4.pathExists(sourceDir)) return;
-  const targetDir = path4.join(monorepoRoot, ".github", "workflows");
-  await fs4.ensureDir(targetDir);
-  const entries = await fs4.readdir(sourceDir);
-  for (const name of entries) {
-    if (!name.startsWith(`${appName}-`)) continue;
-    if (!/\.(ya?ml)$/.test(name)) continue;
-    await fs4.move(path4.join(sourceDir, name), path4.join(targetDir, name), {
-      overwrite: true
-    });
-  }
-  if ((await fs4.readdir(sourceDir)).length === 0) {
-    await fs4.rmdir(sourceDir);
-    const packageGithub = path4.join(packageDir, ".github");
-    if ((await fs4.readdir(packageGithub)).length === 0) {
-      await fs4.rmdir(packageGithub);
-    }
-  }
-}
 async function writeMosaicFiles(packageDir, config, projectType) {
   const templateVersions = readTemplateVersions();
   const manifest = {
@@ -431,8 +439,8 @@ async function writeMosaicFiles(packageDir, config, projectType) {
     }
   };
   await writeManifest(packageDir, manifest);
-  const notesPath = path4.join(packageDir, "mosaic-template-notes.md");
-  await fs4.writeFile(
+  const notesPath = path6.join(packageDir, "mosaic-template-notes.md");
+  await fs6.writeFile(
     notesPath,
     `# Mosaic Divergence Notes
 
@@ -445,6 +453,90 @@ _None yet \u2014 freshly created from template._
 `
   );
 }
+async function scaffoldMonorepo(targetDir, config) {
+  const monoSpinner = ora("Copying monorepo template...").start();
+  try {
+    await copyTemplate(targetDir, "monorepo");
+    monoSpinner.succeed("Copied monorepo template");
+  } catch (error) {
+    monoSpinner.fail("Failed to copy monorepo template");
+    console.error(error);
+    process.exit(1);
+  }
+  const replaceSpinner = ora("Replacing monorepo placeholders...").start();
+  try {
+    const stats = await replacePlaceholders(targetDir, config);
+    replaceSpinner.succeed(
+      `Replaced placeholders in ${stats.modified} monorepo files`
+    );
+  } catch (error) {
+    replaceSpinner.fail("Failed to replace monorepo placeholders");
+    console.error(error);
+    process.exit(1);
+  }
+}
+async function addPackageToMonorepo(args) {
+  const { packageDir, monorepoRoot, projectType, config } = args;
+  const copySpinner = ora("Copying package template...").start();
+  try {
+    await copyTemplate(packageDir, projectType);
+    copySpinner.succeed("Copied package template");
+  } catch (error) {
+    copySpinner.fail("Failed to copy package template");
+    console.error(error);
+    process.exit(1);
+  }
+  const replaceSpinner = ora("Replacing package placeholders...").start();
+  try {
+    const stats = await replacePlaceholders(packageDir, config);
+    replaceSpinner.succeed(
+      `Replaced placeholders in ${stats.modified} package files`
+    );
+  } catch (error) {
+    replaceSpinner.fail("Failed to replace package placeholders");
+    console.error(error);
+    process.exit(1);
+  }
+  await writeMosaicFiles(packageDir, config, projectType);
+  if (projectType === "webapp") {
+    await generateEnvLocal(packageDir);
+    await relocateWorkflowsToRoot(packageDir, monorepoRoot, config.name);
+  }
+}
+function initGitRepo(targetDir) {
+  const gitSpinner = ora("Initializing git repository...").start();
+  try {
+    execSync("git init", { cwd: targetDir, stdio: "ignore" });
+    execSync("git add -A", { cwd: targetDir, stdio: "ignore" });
+    execSync('git commit -m "Initial commit from @percepta/create"', {
+      cwd: targetDir,
+      stdio: "ignore"
+    });
+    gitSpinner.succeed("Initialized git repository");
+  } catch {
+    gitSpinner.warn("Failed to initialize git repository");
+  }
+}
+async function installAtMonorepoRoot(monorepoRoot, installDeps) {
+  if (!installDeps) return false;
+  const spinner = ora(
+    `Installing dependencies with ${PACKAGE_MANAGER}...`
+  ).start();
+  try {
+    await runPackageManagerInstall(PACKAGE_MANAGER, monorepoRoot);
+    spinner.succeed("Installed dependencies");
+    return true;
+  } catch {
+    spinner.warn(
+      `Failed to install dependencies. Run '${PACKAGE_MANAGER} install' from monorepo root.`
+    );
+    return false;
+  }
+}
+async function maybeAutoRunWebapp(packageDir, projectType, installSucceeded) {
+  if (!packageDir || projectType !== "webapp" || !installSucceeded) return false;
+  return autoRunWebapp(packageDir);
+}
 function getProjectTypeLabel(projectType) {
   switch (projectType) {
     case "monorepo":
@@ -512,7 +604,7 @@ async function createProject(options) {
   if (options.yes) {
     const projectType = options.type || "webapp";
     const kebabName = toKebabCase(projectName);
-    const directory = monorepoContext.found && monorepoContext.packageDir ? path4.join(monorepoContext.packageDir, kebabName) : path4.resolve(cwd, kebabName);
+    const directory = monorepoContext.found && monorepoContext.packageDir ? path6.join(monorepoContext.packageDir, kebabName) : path6.resolve(cwd, kebabName);
     answers = {
       projectType,
       directory,
@@ -528,9 +620,31 @@ async function createProject(options) {
       monorepoContext
     });
     if (monorepoContext.found && monorepoContext.packageDir && !answers.directory) {
-      answers.directory = path4.join(monorepoContext.packageDir, answers.name);
+      answers.directory = path6.join(monorepoContext.packageDir, answers.name);
     }
   }
+  if (answers.projectType === "webapp" && answers.installDeps && !process.env.NPM_TOKEN) {
+    console.log();
+    console.error(chalk.red("Error: NPM_TOKEN environment variable is not set."));
+    console.error(chalk.dim("  Required to install private @percepta/* packages."));
+    console.error();
+    console.error("  1. Grab the npm token from 1Password:");
+    console.error(
+      chalk.cyan(
+        "     https://start.1password.com/open/i?a=5TX2B4O3QNE4FNQ2A7ZJZDRRBI&v=j7trpyuqh7gt635dtuj6y4pwjm&i=cmmdi5trji7ctkn3fseakf4mgi&h=aitco.1password.com"
+      )
+    );
+    console.error("  2. Add to ~/.zshrc:");
+    console.error(chalk.cyan('     export NPM_TOKEN="<paste-token>"'));
+    console.error("  3. Open a new terminal (or " + chalk.cyan("source ~/.zshrc") + ") and re-run.");
+    console.error();
+    console.error(
+      chalk.dim(
+        "  Or pass --skip-install to scaffold without running install."
+      )
+    );
+    process.exit(1);
+  }
   const config = {
     name: answers.name,
     title: answers.title,
@@ -540,7 +654,8 @@ async function createProject(options) {
   };
   const typeLabel = getProjectTypeLabel(answers.projectType);
   if (monorepoContext.found) {
-    const packageDir = monorepoContext.packageDir ? path4.join(monorepoContext.packageDir, answers.name) : answers.directory;
+    const monorepoRoot = monorepoContext.rootDir;
+    const packageDir = monorepoContext.packageDir ? path6.join(monorepoContext.packageDir, answers.name) : answers.directory;
     console.log(chalk.dim("  Package type:"), typeLabel);
     console.log(chalk.dim("  Target:"), packageDir);
     console.log(chalk.dim("  Name:"), config.name);
@@ -549,8 +664,8 @@ async function createProject(options) {
       console.log(chalk.dim("  Database:"), config.dbName);
     }
     console.log();
-    if (await fs4.pathExists(packageDir)) {
-      const files = await fs4.readdir(packageDir);
+    if (await fs6.pathExists(packageDir)) {
+      const files = await fs6.readdir(packageDir);
       if (files.length > 0) {
         console.error(
           chalk.red(`Error: Directory ${packageDir} is not empty.`)
@@ -558,81 +673,45 @@ async function createProject(options) {
         process.exit(1);
       }
     }
-    const copySpinner = ora("Copying template files...").start();
-    try {
-      await copyTemplate(packageDir, answers.projectType);
-      copySpinner.succeed("Copied template files");
-    } catch (error) {
-      copySpinner.fail("Failed to copy template files");
-      console.error(error);
-      process.exit(1);
-    }
-    const replaceSpinner = ora("Replacing placeholders...").start();
-    try {
-      const stats = await replacePlaceholders(packageDir, config);
-      replaceSpinner.succeed(
-        `Replaced placeholders in ${stats.modified} files`
-      );
-    } catch (error) {
-      replaceSpinner.fail("Failed to replace placeholders");
-      console.error(error);
-      process.exit(1);
-    }
-    await writeMosaicFiles(packageDir, config, answers.projectType);
-    if (answers.projectType === "webapp") {
-      await generateEnvLocal(packageDir);
-    }
-    if (answers.projectType === "webapp") {
-      await relocateWorkflowsToRoot(
+    if (answers.projectType !== "monorepo") {
+      await addPackageToMonorepo({
         packageDir,
-        monorepoContext.rootDir,
-        config.name
-      );
-    }
-    await warnIfMissingRootNpmrc(monorepoContext.rootDir);
-    let installSucceeded = false;
-    if (answers.installDeps) {
-      const packageManager = PACKAGE_MANAGER;
-      const installSpinner = ora(
-        `Installing dependencies with ${packageManager}...`
-      ).start();
-      try {
-        await runPackageManagerInstall(
-          packageManager,
-          monorepoContext.rootDir
-        );
-        installSpinner.succeed("Installed dependencies");
-        installSucceeded = true;
-      } catch {
-        installSpinner.warn(
-          `Failed to install dependencies. Run '${packageManager} install' from monorepo root.`
-        );
-      }
+        monorepoRoot,
+        projectType: answers.projectType,
+        config
+      });
     }
+    await warnIfMissingRootNpmrc(monorepoRoot);
+    const installSucceeded = await installAtMonorepoRoot(
+      monorepoRoot,
+      answers.installDeps
+    );
     console.log();
     console.log(
       chalk.green("\u2714"),
       chalk.bold(`Created ${typeLabel} at`),
-      chalk.cyan(path4.relative(monorepoContext.rootDir, packageDir))
+      chalk.cyan(path6.relative(monorepoRoot, packageDir))
     );
     console.log();
-    if (answers.projectType === "webapp" && installSucceeded) {
-      const devStarted = await autoRunWebapp(packageDir);
-      if (devStarted) return;
-    }
+    const devStarted = await maybeAutoRunWebapp(
+      packageDir,
+      answers.projectType,
+      installSucceeded
+    );
+    if (devStarted) return;
     printNextStepsExisting(answers, options, packageDir);
   } else {
     const isBareMonorepo = answers.projectType === "monorepo";
-    const targetDir = answers.directory;
-    const packageDir = isBareMonorepo ? null : path4.join(targetDir, "packages", answers.name);
+    const monorepoRoot = answers.directory;
+    const packageDir = isBareMonorepo ? null : path6.join(monorepoRoot, "packages", answers.name);
     if (isBareMonorepo) {
       console.log(chalk.dim("  Type:"), typeLabel);
-      console.log(chalk.dim("  Directory:"), targetDir);
+      console.log(chalk.dim("  Directory:"), monorepoRoot);
       console.log(chalk.dim("  Name:"), config.name);
       console.log(chalk.dim("  Title:"), config.title);
     } else {
       console.log(chalk.dim("  Package type:"), typeLabel);
-      console.log(chalk.dim("  Monorepo directory:"), targetDir);
+      console.log(chalk.dim("  Monorepo directory:"), monorepoRoot);
       console.log(chalk.dim("  Package:"), `packages/${answers.name}/`);
       console.log(chalk.dim("  Name:"), config.name);
       console.log(chalk.dim("  Title:"), config.title);
@@ -641,101 +720,34 @@ async function createProject(options) {
       }
     }
     console.log();
-    if (await fs4.pathExists(targetDir)) {
-      const files = await fs4.readdir(targetDir);
+    if (await fs6.pathExists(monorepoRoot)) {
+      const files = await fs6.readdir(monorepoRoot);
       if (files.length > 0) {
         console.error(
-          chalk.red(`Error: Directory ${targetDir} is not empty.`)
-        );
-        process.exit(1);
-      }
-    }
-    const monoSpinner = ora("Copying monorepo template...").start();
-    try {
-      await copyTemplate(targetDir, "monorepo");
-      monoSpinner.succeed("Copied monorepo template");
-    } catch (error) {
-      monoSpinner.fail("Failed to copy monorepo template");
-      console.error(error);
-      process.exit(1);
-    }
-    const monoReplaceSpinner = ora(
-      "Replacing monorepo placeholders..."
-    ).start();
-    try {
-      const stats = await replacePlaceholders(targetDir, config);
-      monoReplaceSpinner.succeed(
-        `Replaced placeholders in ${stats.modified} monorepo files`
-      );
-    } catch (error) {
-      monoReplaceSpinner.fail("Failed to replace monorepo placeholders");
-      console.error(error);
-      process.exit(1);
-    }
-    if (packageDir) {
-      const pkgSpinner = ora("Copying package template...").start();
-      try {
-        await copyTemplate(packageDir, answers.projectType);
-        pkgSpinner.succeed("Copied package template");
-      } catch (error) {
-        pkgSpinner.fail("Failed to copy package template");
-        console.error(error);
-        process.exit(1);
-      }
-      const pkgReplaceSpinner = ora(
-        "Replacing package placeholders..."
-      ).start();
-      try {
-        const stats = await replacePlaceholders(packageDir, config);
-        pkgReplaceSpinner.succeed(
-          `Replaced placeholders in ${stats.modified} package files`
+          chalk.red(`Error: Directory ${monorepoRoot} is not empty.`)
         );
-      } catch (error) {
-        pkgReplaceSpinner.fail("Failed to replace package placeholders");
-        console.error(error);
         process.exit(1);
       }
-      await writeMosaicFiles(packageDir, config, answers.projectType);
-      if (answers.projectType === "webapp") {
-        await generateEnvLocal(packageDir);
-      }
-      if (answers.projectType === "webapp") {
-        await relocateWorkflowsToRoot(packageDir, targetDir, config.name);
-      }
     }
-    const gitSpinner = ora("Initializing git repository...").start();
-    try {
-      execSync("git init", { cwd: targetDir, stdio: "ignore" });
-      execSync("git add -A", { cwd: targetDir, stdio: "ignore" });
-      execSync('git commit -m "Initial commit from @percepta/create"', {
-        cwd: targetDir,
-        stdio: "ignore"
+    await scaffoldMonorepo(monorepoRoot, config);
+    if (packageDir && answers.projectType !== "monorepo") {
+      await addPackageToMonorepo({
+        packageDir,
+        monorepoRoot,
+        projectType: answers.projectType,
+        config
       });
-      gitSpinner.succeed("Initialized git repository");
-    } catch {
-      gitSpinner.warn("Failed to initialize git repository");
-    }
-    let installSucceeded = false;
-    if (answers.installDeps) {
-      const packageManager = PACKAGE_MANAGER;
-      const installSpinner = ora(
-        `Installing dependencies with ${packageManager}...`
-      ).start();
-      try {
-        await runPackageManagerInstall(packageManager, targetDir);
-        installSpinner.succeed("Installed dependencies");
-        installSucceeded = true;
-      } catch {
-        installSpinner.warn(
-          `Failed to install dependencies. Run '${packageManager} install' manually.`
-        );
-      }
     }
+    initGitRepo(monorepoRoot);
+    const installSucceeded = await installAtMonorepoRoot(
+      monorepoRoot,
+      answers.installDeps
+    );
     console.log();
     console.log(
       chalk.green("\u2714"),
       chalk.bold(isBareMonorepo ? `Created ${typeLabel} at` : "Created monorepo at"),
-      chalk.cyan(targetDir)
+      chalk.cyan(monorepoRoot)
     );
     if (!isBareMonorepo) {
       console.log(
@@ -745,11 +757,13 @@ async function createProject(options) {
       );
     }
     console.log();
-    if (packageDir && answers.projectType === "webapp" && installSucceeded) {
-      const devStarted = await autoRunWebapp(packageDir);
-      if (devStarted) return;
-    }
-    printNextStepsNew(answers, options, targetDir);
+    const devStarted = await maybeAutoRunWebapp(
+      packageDir,
+      answers.projectType,
+      installSucceeded
+    );
+    if (devStarted) return;
+    printNextStepsNew(answers, options, monorepoRoot);
   }
 }
 function printWebappNextSteps(params) {
@@ -817,10 +831,10 @@ function printWebappNextSteps(params) {
   }
 }
 async function warnIfMissingRootNpmrc(rootDir) {
-  const rootNpmrc = path4.join(rootDir, ".npmrc");
+  const rootNpmrc = path6.join(rootDir, ".npmrc");
   let contents = "";
-  if (await fs4.pathExists(rootNpmrc)) {
-    contents = await fs4.readFile(rootNpmrc, "utf8");
+  if (await fs6.pathExists(rootNpmrc)) {
+    contents = await fs6.readFile(rootNpmrc, "utf8");
   }
   if (contents.includes("@percepta:registry")) {
     return;
@@ -835,7 +849,7 @@ async function warnIfMissingRootNpmrc(rootDir) {
       "  pnpm reads .npmrc from the workspace root, so add these lines to"
     )
   );
-  console.log(chalk.dim(`  ${path4.join(rootDir, ".npmrc")}:`));
+  console.log(chalk.dim(`  ${path6.join(rootDir, ".npmrc")}:`));
   console.log();
   console.log(
     chalk.cyan("    @percepta:registry=https://registry.npmjs.org/")
@@ -847,7 +861,7 @@ async function warnIfMissingRootNpmrc(rootDir) {
 }
 function printNextStepsNew(answers, options, targetDir) {
   const pm = PACKAGE_MANAGER;
-  const relativePath = path4.relative(process.cwd(), targetDir) || ".";
+  const relativePath = path6.relative(process.cwd(), targetDir) || ".";
   console.log("Next steps:");
   console.log();
   switch (answers.projectType) {
@@ -903,9 +917,9 @@ function printNextStepsNew(answers, options, targetDir) {
 }
 function printNextStepsExisting(answers, options, packageDir) {
   const pm = PACKAGE_MANAGER;
-  const packageRelativePath = path4.relative(process.cwd(), packageDir) || ".";
-  const monorepoRoot = path4.dirname(path4.dirname(packageDir));
-  const monorepoRelativePath = path4.relative(process.cwd(), monorepoRoot) || ".";
+  const packageRelativePath = path6.relative(process.cwd(), packageDir) || ".";
+  const monorepoRoot = path6.dirname(path6.dirname(packageDir));
+  const monorepoRelativePath = path6.relative(process.cwd(), monorepoRoot) || ".";
   console.log("Next steps:");
   console.log();
   switch (answers.projectType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percepta/create",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Scaffold a new Mosaic package",
   "type": "module",
   "bin": {