@codefast/cli 0.3.1-canary.11 → 0.3.1-canary.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @codefast/cli
 
+## 0.3.1-canary.12
+
+### Patch Changes
+
+- [`0841266`](https://github.com/codefastlabs/codefast/commit/0841266536570b017099fd32b6f0b732cc562932) Thanks [@thevuong](https://github.com/thevuong)! - fix(cli): remove redundant default action from CLI
+
+- [`5d33972`](https://github.com/codefastlabs/codefast/commit/5d339720048479b37ce3ded253d5182364df6762) Thanks [@thevuong](https://github.com/thevuong)! - refactor(cli): update styles and constants for project creation
+
+- [`109a2a5`](https://github.com/codefastlabs/codefast/commit/109a2a5cf4a205d4c5ceb5c3ac7afa95ca69a51d) Thanks [@thevuong](https://github.com/thevuong)! - feat(cli): improve ReactNode handling and RootLayout typings
+
+- [`e873ddc`](https://github.com/codefastlabs/codefast/commit/e873ddcdabb110655e39aa7a69a0850c9050186e) Thanks [@thevuong](https://github.com/thevuong)! - refactor(cli): centralize file operations and error handling
+
 ## 0.3.1-canary.11
 
 ### Patch Changes

package/dist/index.cjs

@@ -49,9 +49,38 @@ function runCommand(command) {
         stdio: "inherit"
     });
 }
-function writeConfigFile(filePath, content) {
-    external_node_fs_default().writeFileSync(filePath, content);
-    console.log(`📝 Created ${filePath}`);
+const FileUtils = {
+    exists (filePath) {
+        return external_node_fs_default().existsSync(filePath);
+    },
+    readFile (filePath) {
+        try {
+            return external_node_fs_default().readFileSync(filePath, "utf8");
+        } catch (error) {
+            throw new Error(`Failed to read file ${filePath}: ${getErrorMessage(error)}`);
+        }
+    },
+    writeFile (filePath, content) {
+        try {
+            external_node_fs_default().writeFileSync(filePath, content);
+        } catch (error) {
+            throw new Error(`Failed to write to file ${filePath}: ${getErrorMessage(error)}`);
+        }
+    },
+    writeConfigFile (filePath, content) {
+        external_node_fs_default().writeFileSync(filePath, content);
+        console.log(`📝 Created ${filePath}`);
+    },
+    validatePath (filePath, filename) {
+        if (!this.exists(filePath)) {
+            console.warn(`⚠️ ${filename} not found, skipping update.`);
+            return false;
+        }
+        return true;
+    }
+};
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : "Unknown error occurred";
 }
 function validateProjectName(name) {
     if (!name || /^\s*$/.test(name)) return {
@@ -290,7 +319,6 @@ yarn-error.log*
 package-lock.json
 yarn.lock
 pnpm-lock.yaml
-src/app/globals.css
 `,
             description: ""
         }
@@ -316,6 +344,7 @@ export default config;
         {
             path: "eslint.config.mjs",
             content: `import { config } from "@codefast/eslint-config/next";
+
 /**
  * @see https://eslint.org/docs/latest/use/configure/configuration-files
  * @type {import('eslint').Linter.Config[]}
@@ -390,6 +419,7 @@ export const fontVariables = cn(fontGeistSans.variable, fontGeistMono.variable);
   :root {
     --font-sans: var(--font-geist-sans);
     --font-mono: var(--font-geist-mono);
+
     --input: var(--color-neutral-200);
     --border: var(--color-neutral-200);
     --ring: var(--color-neutral-400);
@@ -423,6 +453,7 @@ export const fontVariables = cn(fontGeistSans.variable, fontGeistMono.variable);
     --chart-4: var(--color-amber-600);
     --chart-5: var(--color-amber-500);
   }
+
   .dark {
     --input: var(--color-neutral-700);
     --border: --alpha(var(--color-neutral-700) / 50%);
@@ -463,87 +494,86 @@ export const fontVariables = cn(fontGeistSans.variable, fontGeistMono.variable);
         }
     ]
 };
+function updateFileIfNeeded(filePath, filename, checkFn, updateFn, successMessage, alreadyUpdatedMessage) {
+    if (!FileUtils.validatePath(filePath, filename)) return;
+    const content = FileUtils.readFile(filePath);
+    if (checkFn(content)) return void console.log(`📝 ${alreadyUpdatedMessage}`);
+    try {
+        const updatedContent = updateFn(content);
+        FileUtils.writeFile(filePath, updatedContent);
+        console.log(`📝 ${successMessage}`);
+    } catch (error) {
+        console.warn(`⚠️ Failed to update ${filename}: ${getErrorMessage(error)}`);
+    }
+}
 function updatePostcssConfig(projectDir) {
     const postcssConfigPath = external_node_path_default().join(projectDir, "postcss.config.mjs");
-    if (!external_node_fs_default().existsSync(postcssConfigPath)) return void console.warn(`⚠️ postcss.config.mjs not found, skipping update.`);
-    let content = external_node_fs_default().readFileSync(postcssConfigPath, "utf8");
     const typeComment = `/** @type {import('postcss-load-config').Config} */\n`;
-    if (content.includes(typeComment)) console.log(`📝 postcss.config.mjs already contains type comment, no changes made.`);
-    else {
-        content = content.replace("const config = {", `${typeComment}const config = {`);
-        external_node_fs_default().writeFileSync(postcssConfigPath, content);
-        console.log(`📝 Updated postcss.config.mjs with type comment.`);
-    }
+    updateFileIfNeeded(postcssConfigPath, "postcss.config.mjs", (content)=>content.includes(typeComment), (content)=>content.replace("const config = {", `${typeComment}const config = {`), "Updated postcss.config.mjs with type comment.", "postcss.config.mjs already contains type comment, no changes made.");
 }
 function updateLayoutFile(projectDir) {
     const layoutPath = external_node_path_default().join(projectDir, "src/app/layout.tsx");
-    if (!external_node_fs_default().existsSync(layoutPath)) return void console.warn(`⚠️ src/app/layout.tsx not found, skipping update.`);
-    let content = external_node_fs_default().readFileSync(layoutPath, "utf8");
-    if (content.includes('<html className={cn(fontVariables, "antialiased")} lang="en">')) return void console.log(`📝 src/app/layout.tsx already uses fontVariables in html tag, no changes made.`);
-    const newImports = `import type { Metadata } from "next";
-
+    const htmlTarget = '<html className={cn(fontVariables, "antialiased")} lang="en">';
+    updateFileIfNeeded(layoutPath, "src/app/layout.tsx", (content)=>content.includes(htmlTarget), (content)=>{
+        const newImports = `import type { Metadata } from "next";
+import type { JSX, ReactNode } from "react";
 import { cn } from "@codefast/ui";
-
 import { fontVariables } from "@/lib/fonts";
 import "@/app/globals.css";`;
-    content = content.replaceAll(/import\s+{[^}]+}\s+from\s+["']next\/font\/google["'];\s*/g, "");
-    content = content.replace(/const\s+geistSans\s*=[^;]+;\s*const\s+geistMono\s*=[^;]+;\s*/, "");
-    content = content.replace(/import\s+type\s+{[^}]+}\s+from\s+["']next["'];\s*import\s+["']\.\/globals\.css["'];\s*/, newImports);
-    const htmlRegex = /<html\s+lang="en"\s*>/;
-    const newHtml = '<html className={cn(fontVariables, "antialiased")} lang="en">';
-    content = content.replace(htmlRegex, newHtml);
-    const bodyRegex = /<body\s+className={`[^`]*`}\s*>/;
-    const newBody = "<body>";
-    content = content.replace(bodyRegex, newBody);
-    try {
-        external_node_fs_default().writeFileSync(layoutPath, content);
-        console.log(`📝 Updated src/app/layout.tsx to use fontVariables in html tag and removed className from body`);
-    } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-        console.warn(`⚠️ Failed to update src/app/layout.tsx: ${errorMessage}`);
-    }
+        let result = content;
+        result = result.replaceAll(/import\s+{[^}]+}\s+from\s+["']next\/font\/google["'];\s*/g, "");
+        result = result.replace(/const\s+geistSans\s*=[^;]+;\s*const\s+geistMono\s*=[^;]+;\s*/, "");
+        result = result.replace(/import\s+type\s+{[^}]+}\s+from\s+["']next["'];\s*import\s+["']\.\/globals\.css["'];\s*/, newImports);
+        result = result.replace(/export default function RootLayout\({\s*children,\s*}\s*:\s*Readonly<{\s*children:\s*React\.ReactNode;\s*}>\)\s*{/, "export default function RootLayout({ children }: Readonly<{ children: ReactNode }>): JSX.Element {");
+        result = result.replace(/<html\s+lang="en"\s*>/, htmlTarget);
+        result = result.replace(/<body\s+className={`[^`]*`}\s*>/, "<body>");
+        return result;
+    }, "Updated src/app/layout.tsx to use fontVariables in html tag, removed className from body, modified ReactNode import, and added return type to RootLayout", "src/app/layout.tsx already uses fontVariables in html tag, no changes made.");
 }
 function updatePackageJson(projectDir) {
     const packageJsonPath = external_node_path_default().join(projectDir, "package.json");
-    const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, "utf8"));
-    packageJson.scripts = {
-        ...packageJson.scripts,
-        "deploy:preview": "vercel deploy --archive=tgz",
-        "deploy:prod": "vercel deploy --archive=tgz --prod",
-        format: "prettier --write --ignore-unknown .",
-        "format:check": "prettier --check --ignore-unknown .",
-        lint: "next lint --fix --max-warnings 0",
-        "lint:check": "next lint --max-warnings 0",
-        "package:install": "pnpm install",
-        "package:outdated": "pnpm outdated",
-        "package:upgrade": "pnpm update --latest",
-        preview: "pnpm build && pnpm start"
-    };
-    packageJson["simple-git-hooks"] = {
-        "pre-commit": "pnpm lint-staged",
-        "commit-msg": "pnpm commitlint --edit"
-    };
-    external_node_fs_default().writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-    console.log(`📝 Updated package.json`);
+    if (!FileUtils.validatePath(packageJsonPath, "package.json")) return;
+    try {
+        const packageJson = JSON.parse(FileUtils.readFile(packageJsonPath));
+        packageJson.scripts = {
+            ...packageJson.scripts,
+            "deploy:preview": "vercel deploy --archive=tgz",
+            "deploy:prod": "vercel deploy --archive=tgz --prod",
+            format: "prettier --write --ignore-unknown .",
+            "format:check": "prettier --check --ignore-unknown .",
+            lint: "next lint --fix --max-warnings 0",
+            "lint:check": "next lint --max-warnings 0",
+            "package:install": "pnpm install",
+            "package:outdated": "pnpm outdated",
+            "package:upgrade": "pnpm update --latest",
+            preview: "pnpm build && pnpm start"
+        };
+        packageJson["simple-git-hooks"] = {
+            "pre-commit": "pnpm lint-staged",
+            "commit-msg": "pnpm commitlint --edit"
+        };
+        FileUtils.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+        console.log(`📝 Updated package.json`);
+    } catch (error) {
+        console.warn(`⚠️ Failed to update package.json: ${getErrorMessage(error)}`);
+    }
 }
 function updateNextConfig(projectDir) {
     const nextConfigPath = external_node_path_default().join(projectDir, "next.config.ts");
-    if (!external_node_fs_default().existsSync(nextConfigPath)) return void console.warn(`⚠️ next.config.ts not found, skipping update.`);
-    let content = external_node_fs_default().readFileSync(nextConfigPath, "utf8");
-    if (content.includes('optimizePackageImports: ["@codefast/ui"]')) return void console.log(`📝 next.config.ts already contains optimizePackageImports configuration, no changes made.`);
-    const configPattern = /const nextConfig: NextConfig = \{/;
-    const experimentalConfig = `const nextConfig: NextConfig = {
+    const optimizePackagesConfig = 'optimizePackageImports: ["@codefast/ui"]';
+    updateFileIfNeeded(nextConfigPath, "next.config.ts", (content)=>content.includes(optimizePackagesConfig), (content)=>content.replace(/const nextConfig: NextConfig = \{/, `const nextConfig: NextConfig = {
   experimental: {
     optimizePackageImports: ["@codefast/ui"],
-  },`;
-    content = content.replace(configPattern, experimentalConfig);
-    try {
-        external_node_fs_default().writeFileSync(nextConfigPath, content);
-        console.log(`📝 Updated next.config.ts with optimizePackageImports configuration.`);
-    } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-        console.warn(`⚠️ Failed to update next.config.ts: ${errorMessage}`);
-    }
+  },`), "Updated next.config.ts with optimizePackageImports configuration.", "next.config.ts already contains optimizePackageImports configuration, no changes made.");
+}
+function updatePageFile(projectDir) {
+    const pagePath = external_node_path_default().join(projectDir, "src/app/page.tsx");
+    updateFileIfNeeded(pagePath, "src/app/page.tsx", (content)=>content.includes("): JSX.Element"), (content)=>{
+        let result = content;
+        if (!result.includes("import type { JSX }")) result = result.includes("import type {") ? result.replace(/import type {(?<types>[^}]+)} from "react";/, 'import type {$1, JSX } from "react";') : result.includes("import {") ? result.replace(/import {/, 'import type { JSX } from "react";\n\nimport {') : `import type { JSX } from "react";\n\n${result}`;
+        result = result.replace(/export default function Home\(\) {/, "export default function Home(): JSX.Element {");
+        return result;
+    }, "Updated src/app/page.tsx to add JSX.Element return type to Home component", "src/app/page.tsx already has JSX.Element return type, no changes made.");
 }
 function createConfigFiles(projectDir) {
     console.log(`\n📝 Creating configuration files...`);
@@ -552,10 +582,10 @@ function createConfigFiles(projectDir) {
         for (const { path: filePath, content, description } of configs){
             const fullPath = external_node_path_default().join(projectDir, filePath);
             const dir = external_node_path_default().dirname(fullPath);
-            if (!external_node_fs_default().existsSync(dir)) external_node_fs_default().mkdirSync(dir, {
+            if (!FileUtils.exists(dir)) external_node_fs_default().mkdirSync(dir, {
                 recursive: true
             });
-            writeConfigFile(fullPath, content);
+            FileUtils.writeConfigFile(fullPath, content);
             if (description) console.log(`  ℹ️ ${filePath}: ${description}`);
         }
     }
@@ -574,8 +604,7 @@ function cleanupPackages() {
     try {
         packageJson = JSON.parse(external_node_fs_namespaceObject.readFileSync(packageJsonPath, "utf8"));
     } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-        console.warn(`⚠️ Error reading package.json: ${errorMessage}, skipping cleanup.`);
+        console.warn(`⚠️ Error reading package.json: ${getErrorMessage(error)}, skipping cleanup.`);
         return;
     }
     const dependencies = packageJson.dependencies ?? {};
@@ -611,6 +640,7 @@ function createProjectCommand(program) {
                 console.log(`📂 Moved to ${projectName}`);
             }
             updateLayoutFile(process.cwd());
+            updatePageFile(process.cwd());
             updatePostcssConfig(process.cwd());
             installDependencies();
             cleanupPackages();
@@ -621,6 +651,8 @@ function createProjectCommand(program) {
             runCommand("pnpm simple-git-hooks");
             console.log(`\n📝 Formatting files with Prettier...`);
             runCommand("pnpm format");
+            console.log(`\n🔍 Running ESLint to check code style...`);
+            runCommand("pnpm lint");
             console.log(`\n✅ Project ${packageJsonExists ? "configured" : "created"} successfully!`);
             console.log(`- Project: ${projectName}`);
             console.log("- Next.js with TypeScript");
@@ -631,8 +663,7 @@ function createProjectCommand(program) {
             console.log(`\n🚀 To start development:`);
             console.log(`cd ${projectName} && pnpm dev`);
         } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-            console.error(`\n❌ An error occurred: ${errorMessage}`);
+            console.error(`\n❌ An error occurred: ${getErrorMessage(error)}`);
             process.exit(1);
         } finally{
             rl.close();
@@ -771,7 +802,7 @@ const EXPORTS_PREVIEW_FILE = "exports-preview.json";
 const EXPORTS_ANALYSIS_FILE = "exports-analysis.json";
 const ENCODING = "utf8";
 const JSON_INDENT = 2;
-const FileUtils = {
+const file_utils_FileUtils = {
     exists (filePath) {
         return external_node_fs_default().existsSync(filePath);
     },
@@ -809,19 +840,19 @@ const FileUtils = {
     }
 };
 function fileExists(filePath) {
-    return FileUtils.exists(filePath);
+    return file_utils_FileUtils.exists(filePath);
 }
 function readPackageJson(filePath) {
-    return FileUtils.readJsonFile(filePath);
+    return file_utils_FileUtils.readJsonFile(filePath);
 }
 function backupPackageJson(filePath) {
     try {
         const content = external_node_fs_default().readFileSync(filePath, ENCODING);
         const dir = external_node_path_default().dirname(filePath);
         const backupDir = external_node_path_default().join(dir, EXPORTS_ANALYSIS_DIR);
-        FileUtils.ensureDirectoryExists(backupDir);
+        file_utils_FileUtils.ensureDirectoryExists(backupDir);
         const baseName = external_node_path_default().basename(filePath);
-        const backupPath = external_node_path_default().join(backupDir, FileUtils.createBackupFilename(baseName));
+        const backupPath = external_node_path_default().join(backupDir, file_utils_FileUtils.createBackupFilename(baseName));
         external_node_fs_default().writeFileSync(backupPath, content, ENCODING);
         return true;
     } catch (error) {
@@ -830,11 +861,11 @@ function backupPackageJson(filePath) {
     }
 }
 function savePackageJson(filePath, content) {
-    return FileUtils.writeJsonFile(filePath, content);
+    return file_utils_FileUtils.writeJsonFile(filePath, content);
 }
 function saveJsonToFile(packageDir, fileName, content) {
-    const outputDir = FileUtils.getAnalysisDir(packageDir);
-    FileUtils.writeJsonFile(external_node_path_default().join(outputDir, fileName), content);
+    const outputDir = file_utils_FileUtils.getAnalysisDir(packageDir);
+    file_utils_FileUtils.writeJsonFile(external_node_path_default().join(outputDir, fileName), content);
 }
 function saveExportsAnalysis(packageDir, analysis) {
     saveJsonToFile(packageDir, EXPORTS_ANALYSIS_FILE, analysis);
@@ -994,12 +1025,6 @@ function main() {
     program.name("codefast").description("CodeFast CLI - A development toolkit for CodeFast.").version(getPackageVersion(), "-v, --version", "display CLI version");
     createUpdateExportsCommand(program);
     createProjectCommand(program);
-    program.action(()=>{
-        console.log('Use "codefast create-project" to create a new Next.js project.');
-        console.log('Use "codefast update-exports" to update exports.');
-        console.log('Run "codefast --help" to see all available commands.');
-        program.help();
-    });
     program.parse(process.argv);
 }
 main();