zuro-cli 0.0.2-beta.4 → 0.0.2-beta.6

package/dist/index.js

@@ -202,18 +202,23 @@ async function ensurePackageManagerAvailable(pm) {
     );
   }
 }
-async function initPackageJson(cwd, force = false, packageName = "zuro-app", srcDir = "src") {
+async function initPackageJson(cwd, force = false, packageName = "zuro-app", srcDir = "src", options = {}) {
   const pkgPath = import_path.default.join(cwd, "package.json");
   if (force || !await import_fs_extra.default.pathExists(pkgPath)) {
+    const scripts = {
+      "dev": `tsx watch ${srcDir}/server.ts`,
+      "build": "tsc",
+      "start": "node dist/server.js"
+    };
+    if (options.enablePrettier) {
+      scripts["format"] = "prettier --write .";
+      scripts["format:check"] = "prettier --check .";
+    }
     await import_fs_extra.default.writeJson(pkgPath, {
       name: normalizePackageName(packageName),
       version: "0.0.1",
       private: true,
-      scripts: {
-        "dev": `tsx watch ${srcDir}/server.ts`,
-        "build": "tsc",
-        "start": "node dist/server.js"
-      }
+      scripts
     }, { spaces: 2 });
   }
 }
@@ -402,6 +407,13 @@ function showNonZuroProjectMessage() {
   console.log("- a fresh/empty directory, or");
   console.log("- an existing project already managed by Zuro CLI.");
 }
+function showInitFirstMessage() {
+  console.log(import_chalk.default.yellow("No Zuro project found in this directory."));
+  console.log("");
+  console.log(import_chalk.default.yellow("Run init first, then add modules."));
+  console.log("");
+  console.log(import_chalk.default.cyan("npx zuro-cli init"));
+}
 
 // src/commands/init.ts
 function resolveSafeTargetPath(projectRoot, srcDir, file) {
@@ -431,6 +443,33 @@ async function ensureSafeTargetDirectory(targetDir, cwd, projectName) {
   });
   return response.proceed === true;
 }
+async function setupPrettier(targetDir) {
+  const prettierConfigPath = import_path4.default.join(targetDir, ".prettierrc");
+  const prettierIgnorePath = import_path4.default.join(targetDir, ".prettierignore");
+  if (!await import_fs_extra4.default.pathExists(prettierConfigPath)) {
+    const prettierConfig = {
+      semi: true,
+      singleQuote: false,
+      trailingComma: "es5",
+      printWidth: 100,
+      tabWidth: 2
+    };
+    await import_fs_extra4.default.writeJson(prettierConfigPath, prettierConfig, { spaces: 2 });
+  }
+  if (!await import_fs_extra4.default.pathExists(prettierIgnorePath)) {
+    const ignoreContent = `node_modules
+dist
+build
+coverage
+.next
+pnpm-lock.yaml
+package-lock.json
+bun.lock
+bun.lockb
+`;
+    await import_fs_extra4.default.writeFile(prettierIgnorePath, ignoreContent);
+  }
+}
 async function init() {
   const cwd = process.cwd();
   const isExistingProject = await import_fs_extra4.default.pathExists(import_path4.default.join(cwd, "package.json"));
@@ -443,6 +482,7 @@ async function init() {
   let pm = "npm";
   let srcDir = "src";
   let projectName = import_path4.default.basename(cwd);
+  let enablePrettier = false;
   if (isExistingProject) {
     console.log(import_chalk2.default.blue("\u2139 Existing project detected."));
     projectName = import_path4.default.basename(cwd);
@@ -480,6 +520,12 @@ async function init() {
           { title: "bun", value: "bun" }
         ],
         initial: 0
+      },
+      {
+        type: "confirm",
+        name: "prettier",
+        message: "Setup Prettier?",
+        initial: true
       }
     ]);
     if (response.pm === void 0) {
@@ -487,6 +533,7 @@ async function init() {
       return;
     }
     pm = response.pm;
+    enablePrettier = response.prettier === true;
     srcDir = "src";
     if (!response.path || response.path.trim() === "") {
       projectName = import_path4.default.basename(cwd);
@@ -525,7 +572,7 @@ async function init() {
     spinner.text = "Initializing project...";
     const hasPackageJson = await import_fs_extra4.default.pathExists(import_path4.default.join(targetDir, "package.json"));
     if (!hasPackageJson) {
-      await initPackageJson(targetDir, true, projectName, srcDir);
+      await initPackageJson(targetDir, true, projectName, srcDir, { enablePrettier });
     }
     currentStep = "dependency installation";
     spinner.text = `Installing dependencies using ${pm}...`;
@@ -542,6 +589,9 @@ async function init() {
     }
     await installDependencies(pm, runtimeDeps, targetDir);
     await installDependencies(pm, devDeps, targetDir, { dev: true });
+    if (enablePrettier) {
+      await installDependencies(pm, ["prettier"], targetDir, { dev: true });
+    }
     currentStep = "module file generation";
     spinner.text = "Fetching core module files...";
     for (const file of coreModule.files) {
@@ -567,6 +617,10 @@ async function init() {
     }
     currentStep = "environment file setup";
     await createInitialEnv(targetDir);
+    if (enablePrettier) {
+      currentStep = "prettier setup";
+      await setupPrettier(targetDir);
+    }
     currentStep = "config write";
     await writeZuroConfig(targetDir, zuroConfig);
     spinner.succeed(import_chalk2.default.green("Project initialized successfully!"));
@@ -751,6 +805,12 @@ function getDatabaseSetupHint(moduleName, dbUrl) {
     return moduleName === "database-pg" ? "createdb <database_name>" : `mysql -e "CREATE DATABASE IF NOT EXISTS <database_name>;"`;
   }
 }
+function getModuleDocsPath(moduleName) {
+  if (isDatabaseModule(moduleName)) {
+    return "database";
+  }
+  return moduleName;
+}
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -763,6 +823,34 @@ async function hasEnvVariable(projectRoot, key) {
   const pattern = new RegExp(`^${escapeRegex(key)}=`, "m");
   return pattern.test(content);
 }
+async function isLikelyEmptyDirectory(cwd) {
+  const entries = await import_fs_extra6.default.readdir(cwd);
+  const ignored = /* @__PURE__ */ new Set([".ds_store", "thumbs.db"]);
+  return entries.filter((entry) => !ignored.has(entry.toLowerCase())).length === 0;
+}
+async function ensureSchemaExport(projectRoot, srcDir, schemaFileName) {
+  const schemaIndexPath = import_path6.default.join(projectRoot, srcDir, "db", "schema", "index.ts");
+  if (!await import_fs_extra6.default.pathExists(schemaIndexPath)) {
+    return;
+  }
+  const exportLine = `export * from "./${schemaFileName}";`;
+  const content = await import_fs_extra6.default.readFile(schemaIndexPath, "utf-8");
+  const normalized = content.replace(/\r\n/g, "\n");
+  const exportPattern = new RegExp(
+    `^\\s*export\\s*\\*\\s*from\\s*["']\\./${escapeRegex(schemaFileName)}["'];?\\s*$`,
+    "m"
+  );
+  if (exportPattern.test(normalized)) {
+    return;
+  }
+  let next = normalized.replace(/^\s*export\s*\{\s*\};?\s*$/m, "").trimEnd();
+  if (next.length > 0) {
+    next += "\n\n";
+  }
+  next += `${exportLine}
+`;
+  await import_fs_extra6.default.writeFile(schemaIndexPath, next);
+}
 async function injectErrorHandler(projectRoot, srcDir) {
   const appPath = import_path6.default.join(projectRoot, srcDir, "app.ts");
   if (!import_fs_extra6.default.existsSync(appPath)) {
@@ -878,6 +966,10 @@ var add = async (moduleName) => {
   const projectRoot = process.cwd();
   const projectConfig = await readZuroConfig(projectRoot);
   if (!projectConfig) {
+    if (await isLikelyEmptyDirectory(projectRoot)) {
+      showInitFirstMessage();
+      return;
+    }
     showNonZuroProjectMessage();
     return;
   }
@@ -1005,6 +1097,10 @@ var add = async (moduleName) => {
       await import_fs_extra6.default.ensureDir(import_path6.default.dirname(targetPath));
       await import_fs_extra6.default.writeFile(targetPath, content);
     }
+    const schemaExports = module2.files.map((file) => file.target.replace(/\\/g, "/")).filter((target) => /^db\/schema\/[^/]+\.ts$/.test(target)).map((target) => import_path6.default.posix.basename(target, ".ts")).filter((name) => name !== "index");
+    for (const schemaFileName of schemaExports) {
+      await ensureSchemaExport(projectRoot, srcDir, schemaFileName);
+    }
     spinner.succeed("Files generated");
     if (resolvedModuleName === "auth") {
       spinner.start("Configuring routes in app.ts...");
@@ -1052,71 +1148,27 @@ var add = async (moduleName) => {
       console.log(import_chalk4.default.blue(`\u2139 Backup created at: ${databaseBackupPath}
 `));
     }
-    if (resolvedModuleName === "auth") {
-      console.log(import_chalk4.default.bold("\u{1F4CB} Next Steps:\n"));
-      if (generatedAuthSecret) {
-        console.log(import_chalk4.default.yellow("1. BETTER_AUTH_SECRET generated automatically."));
-      } else {
-        console.log(import_chalk4.default.yellow("1. Review your auth env values in .env."));
-      }
-      console.log(import_chalk4.default.dim("   Make sure BETTER_AUTH_URL matches your API origin (for example http://localhost:3000).\n"));
-      console.log(import_chalk4.default.yellow("2. Run database migrations:"));
-      console.log(import_chalk4.default.cyan("   npx drizzle-kit generate"));
-      console.log(import_chalk4.default.cyan("   npx drizzle-kit migrate\n"));
-      console.log(import_chalk4.default.yellow("3. Available endpoints:"));
-      console.log(import_chalk4.default.dim("   POST /auth/sign-up/email  - Register"));
-      console.log(import_chalk4.default.dim("   POST /auth/sign-in/email  - Login"));
-      console.log(import_chalk4.default.dim("   POST /auth/sign-out       - Logout"));
-      console.log(import_chalk4.default.dim("   GET  /api/users/me        - Current user\n"));
-    } else if (resolvedModuleName === "error-handler") {
-      console.log(import_chalk4.default.bold("\u{1F4CB} Usage:\n"));
-      console.log(import_chalk4.default.yellow("Throw errors in your controllers:"));
-      console.log(import_chalk4.default.dim("   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-      console.log(import_chalk4.default.white(`   import { UnauthorizedError, NotFoundError } from "./lib/errors";`));
-      console.log("");
-      console.log(import_chalk4.default.white(`   throw new UnauthorizedError("Invalid credentials");`));
-      console.log(import_chalk4.default.white(`   throw new NotFoundError("User not found");`));
-      console.log(import_chalk4.default.dim("   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-      console.log(import_chalk4.default.yellow("Available error classes:"));
-      console.log(import_chalk4.default.dim("   BadRequestError     (400)"));
-      console.log(import_chalk4.default.dim("   UnauthorizedError   (401)"));
-      console.log(import_chalk4.default.dim("   ForbiddenError      (403)"));
-      console.log(import_chalk4.default.dim("   NotFoundError       (404)"));
-      console.log(import_chalk4.default.dim("   ConflictError       (409)"));
-      console.log(import_chalk4.default.dim("   ValidationError     (422)"));
-      console.log(import_chalk4.default.dim("   InternalServerError (500)\n"));
-      console.log(import_chalk4.default.yellow("Wrap async handlers:"));
-      console.log(import_chalk4.default.dim("   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-      console.log(import_chalk4.default.white(`   import { asyncHandler } from "./middleware/error-handler";`));
-      console.log("");
-      console.log(import_chalk4.default.white(`   router.get("/users", asyncHandler(async (req, res) => {`));
-      console.log(import_chalk4.default.white("       // errors auto-caught"));
-      console.log(import_chalk4.default.white("   }));"));
-      console.log(import_chalk4.default.dim("   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-    } else if (isDatabaseModule(resolvedModuleName)) {
-      console.log(import_chalk4.default.bold("\u{1F4CB} Next Steps:\n"));
-      let stepNum = 1;
+    const docsPath = getModuleDocsPath(resolvedModuleName);
+    const docsUrl = `https://zuro-cli.devbybriyan.com/docs/${docsPath}`;
+    console.log(import_chalk4.default.blue(`\u2139 Docs: ${docsUrl}`));
+    if (isDatabaseModule(resolvedModuleName)) {
       if (usedDefaultDbUrl) {
-        console.log(import_chalk4.default.yellow(`${stepNum}. Update DATABASE_URL in .env:`));
-        console.log(
-          import_chalk4.default.dim("   We added a local default. Update it if your DB host/user/password differ.\n")
-        );
-        stepNum++;
+        console.log(import_chalk4.default.yellow("\u2139 Review DATABASE_URL in .env if your local DB config differs."));
       }
-      console.log(import_chalk4.default.yellow(`${stepNum}. Create schemas in ${srcDir}/db/schema/:`));
-      console.log(import_chalk4.default.dim("   Add table files and export from index.ts\n"));
-      stepNum++;
       const setupHint = getDatabaseSetupHint(
         resolvedModuleName,
         customDbUrl || DEFAULT_DATABASE_URLS[resolvedModuleName]
       );
-      console.log(import_chalk4.default.yellow(`${stepNum}. Ensure the database exists:`));
-      console.log(import_chalk4.default.cyan(`   ${setupHint}
-`));
-      stepNum++;
-      console.log(import_chalk4.default.yellow(`${stepNum}. Run migrations:`));
-      console.log(import_chalk4.default.cyan("   npx drizzle-kit generate"));
-      console.log(import_chalk4.default.cyan("   npx drizzle-kit migrate\n"));
+      console.log(import_chalk4.default.yellow(`\u2139 Ensure DB exists: ${setupHint}`));
+      console.log(import_chalk4.default.yellow("\u2139 Run migrations: npx drizzle-kit generate && npx drizzle-kit migrate"));
+    }
+    if (resolvedModuleName === "auth") {
+      if (generatedAuthSecret) {
+        console.log(import_chalk4.default.yellow("\u2139 BETTER_AUTH_SECRET was generated automatically."));
+      } else {
+        console.log(import_chalk4.default.yellow("\u2139 Review BETTER_AUTH_SECRET and BETTER_AUTH_URL in .env."));
+      }
+      console.log(import_chalk4.default.yellow("\u2139 Run migrations: npx drizzle-kit generate && npx drizzle-kit migrate"));
     }
   } catch (error) {
     spinner.fail(import_chalk4.default.red(`Failed during ${currentStep}.`));