astrod-cli 1.0.1 → 1.0.4

package/bin/cli.js

@@ -46,15 +46,50 @@ async function listFiles(dir, baseDir = '') {
   return results;
 }
 
+async function updateViteMainFile(targetDir) {
+  const mainFiles = ['main.jsx', 'main.tsx'];
+  for (const file of mainFiles) {
+    const filePath = path.join(targetDir, file);
+    if (fs.existsSync(filePath)) {
+      let content = await fs.readFile(filePath, 'utf8');
+      
+      // Update App import to point to the new app/App location
+      content = content.replace(/import App from '\.\/App'/g, "import App from './app/App'");
+      
+      // Remove old CSS imports
+      content = content.replace(/import '\.\/App\.css';?\n?/g, "");
+      content = content.replace(/import '\.\/index\.css';?\n?/g, "");
+      
+      await fs.writeFile(filePath, content, 'utf8');
+      console.log(`\x1b[32mUpdated ${file} to use new module structure.\x1b[0m`);
+    }
+  }
+}
+
+async function cleanupViteFiles(targetDir) {
+  // Common files to remove for a clean module structure
+  const filesToDelete = [
+    'App.jsx', 'App.tsx', 'App.css', 'index.css', 
+    'components', 'hooks', 'utils', 'pages'
+  ];
+  for (const item of filesToDelete) {
+    const itemPath = path.join(targetDir, item);
+    if (fs.existsSync(itemPath)) {
+      await fs.remove(itemPath);
+      console.log(`\x1b[33mRemoved existing ${item} for clean module initialization.\x1b[0m`);
+    }
+  }
+}
+
 program
-  .name('my-struct')
+  .name('astrod')
   .description('CLI to inject folder structures into Vite, Next, and React Native projects')
   .version('1.0.0');
 
 program
   .command('init')
   .description('Initialize the folder structure')
-  .option('-f, --force', 'Overwrite existing src directory')
+  .option('-f, --force', 'Overwrite conflicting files if src directory already exists')
   .option('-d, --dry-run', 'List files that would be created without actually creating them')
   .action(async (options) => {
     try {
@@ -91,17 +126,32 @@ program
         return;
       }
 
-      if (fs.existsSync(targetDir) && !options.force) {
-        console.warn('\x1b[33mWarning: The "src" directory already exists. Use --force to overwrite.\x1b[0m');
-        process.exit(1);
+      if (fs.existsSync(targetDir)) {
+        console.log('\x1b[33mNotice: The "src" directory already exists. Merging new structure into it...\x1b[0m');
+      }
+
+      if (framework === 'vite') {
+        await cleanupViteFiles(targetDir);
       }
 
       await fs.copy(templateDir, targetDir, {
         overwrite: options.force,
-        errorOnExist: !options.force
+        errorOnExist: false
       });
 
-      console.log(`\x1b[32mSuccessfully injected ${structureType} structure for ${framework} into src/ folder!\x1b[0m`);
+      if (framework === 'vite') {
+        await updateViteMainFile(targetDir);
+      }
+
+      console.log(`\n\x1b[32m✔ Successfully injected ${structureType} structure for ${framework}!\x1b[0m`);
+      
+      console.log('\n\x1b[36m--- Next Steps ---\x1b[0m');
+      console.log(`1. Run \x1b[33mnpm install\x1b[0m (if you haven't already)`);
+      if (framework === 'vite' && structureType === 'module') {
+        console.log(`2. Install routing: \x1b[33mnpm install react-router-dom\x1b[0m`);
+      }
+      console.log(`3. Start developing in \x1b[33msrc/\x1b[0m`);
+      console.log('\n\x1b[35mHappy coding with ASTROD! 🚀\x1b[0m\n');
 
     } catch (error) {
       console.error('\x1b[31mAn error occurred:\x1b[0m', error.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astrod-cli",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "A CLI tool that injects folder structures into existing Vite, Next, and React Native projects.",
   "type": "module",
   "main": "./bin/cli.js",
@@ -25,7 +25,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "astrod-cli": "^1.0.0",
     "commander": "^11.1.0",
     "fs-extra": "^11.2.0",
     "inquirer": "^9.2.12",

package/templates/next/module/src/app/layout.tsx

@@ -0,0 +1,22 @@
+import type { Metadata } from "next";
+import { Inter } from "next/font/google";
+import "../styles/globals.css";
+
+const inter = Inter({ subsets: ["latin"] });
+
+export const metadata: Metadata = {
+  title: "ASTROD Next App",
+  description: "Built with ASTROD CLI",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <body className={inter.className}>{children}</body>
+    </html>
+  );
+}

package/templates/next/module/src/app/page.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+
+export default function Home() {
+  return (
+    <main className="flex min-h-screen flex-col items-center justify-between p-24">
+      <div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
+        <h1 className="text-4xl font-bold">Welcome to ASTROD Next.js Structure!</h1>
+        <p className="mt-4">Edit src/app/page.tsx to get started.</p>
+      </div>
+    </main>
+  );
+}

package/templates/react-native/module/src/app/App.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { SafeAreaView, StyleSheet, Text, View } from 'react-native';
+import { AppNavigator } from '../shared/navigation/AppNavigator';
+
+const App = () => {
+  return (
+    <SafeAreaView style={styles.container}>
+      <AppNavigator />
+    </SafeAreaView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+});
+
+export default App;

package/templates/vite/module/src/App.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+
+function App() {
+  return (
+    <div className="App">
+      <h1>Welcome to ASTROD (Module-based Structure)</h1>
+      <p>Your modular Vite project has been successfully initialized.</p>
+    </div>
+  );
+}
+
+export default App;

package/templates/vite/module/src/app/App.tsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { RouterProvider } from 'react-router-dom';
+import { router } from './router';
+import './styles/global.css';
+
+const App: React.FC = () => {
+  return (
+    <React.StrictMode>
+      <RouterProvider router={router} />
+    </React.StrictMode>
+  );
+};
+
+export default App;

package/templates/vite/module/src/app/main.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import App from './App';
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+);

package/templates/vite/module/src/app/router.tsx

@@ -0,0 +1,15 @@
+import { createBrowserRouter } from 'react-router-dom';
+import React from 'react';
+
+// Example module routes
+// import { authRoutes } from '../modules/auth/routes';
+// import { dashboardRoutes } from '../modules/dashboard/routes';
+
+export const router = createBrowserRouter([
+  {
+    path: '/',
+    element: <div>Welcome to ASTROD CLI! Start by editing src/app/App.tsx</div>,
+  },
+  // ...authRoutes,
+  // ...dashboardRoutes,
+]);

package/templates/vite/module/src/config/index.ts

@@ -0,0 +1,7 @@
+export const config = {
+  apiBaseUrl: import.meta.env.VITE_API_URL || 'https://api.example.com',
+  environment: import.meta.env.MODE || 'development',
+  appName: 'ASTROD Vite App',
+};
+
+export default config;

package/templates/vite/module/src/modules/shared/components/Button.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+
+interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  variant?: 'primary' | 'secondary';
+}
+
+export const Button: React.FC<ButtonProps> = ({ children, variant = 'primary', ...props }) => {
+  const styles: React.CSSProperties = {
+    padding: '0.6em 1.2em',
+    fontSize: '1em',
+    fontWeight: '500',
+    fontFamily: 'inherit',
+    backgroundColor: variant === 'primary' ? '#646cff' : '#1a1a1a',
+    color: '#ffffff',
+    cursor: 'pointer',
+    border: '1px solid transparent',
+    borderRadius: '8px',
+    transition: 'border-color 0.25s',
+  };
+
+  return (
+    <button style={styles} {...props}>
+      {children}
+    </button>
+  );
+};

package/templates/vite/module/src/styles/global.css

@@ -0,0 +1,29 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}

package/templates/vite/open/src/App.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+
+function App() {
+  return (
+    <div className="App">
+      <h1>Welcome to ASTROD (Open Structure)</h1>
+      <p>Your Vite project has been successfully initialized.</p>
+    </div>
+  );
+}
+
+export default App;