evophp 1.1.1 → 1.2.0

package/README.md

@@ -10,12 +10,12 @@ EvoPHP CLI is a command-line interface designed to simplify the development and
 
 * [Installation](#installation)
 * [All Commands](#all-commands)
-
   * [Initialization](#initialization)
   * [Plugin/Theme Creation](#plugintheme-creation)
   * [Plugin/Theme Installation](#plugintheme-installation)
   * [Plugin/Theme Uninstallation](#plugintheme-uninstallation)
   * [Dependency Management](#dependency-management)
+  * [Entry Management](#entry-management)
 * [Authentication & PAT Storage](#authentication--pat-storage)
 * [Further Documentation](#further-documentation)
 
@@ -67,18 +67,17 @@ evophp n plugin <name>
 evophp n theme <name>
 ```
 
-* Creates a new plugin or theme from a template.
+* Creates a new plugin or theme from a template in **your own GitHub account**.
 
 * Supports:
-
   * Just `<name>` → Uses your GitHub account (token required)
-  * `<author>/<name>` → Creates in the specified GitHub account
+  * ⚠️ You can only create repositories under your GitHub account.
 
 * Examples:
 
   ```bash
-  evophp new plugin MyPlugin              # Uses your GitHub
-  evophp n plugin johndoe/BlogEnhancer    # Uses johndoe's GitHub
+  evophp new plugin MyPlugin              # Creates in your GitHub
+  evophp n theme MyTheme                  # Creates in your GitHub
   ```
 
 ---
@@ -95,7 +94,6 @@ evophp i theme <name>
 * Installs a plugin or theme from GitHub into your project.
 
 * Supports:
-
   * Just `<name>` → Clones from your GitHub account (token required)
   * `<author>/<name>` → Clones from public GitHub repo (no token required)
 
@@ -157,6 +155,32 @@ evophp d MyPlugin --composer
 
 ---
 
+### Entry Management
+
+```bash
+evophp entry <plugin> <entry>
+evophp e <plugin> <entry>
+```
+
+* Adds a new entry point to a plugin.
+* Prompts for:
+  * Landing page name (default: `index`)
+  * Route path
+  * Role access permissions (IDs from config.json)
+  * Page title
+* Creates:
+  * Blade view file
+  * JavaScript entry and router files
+  * Route entry in `Routes.php`
+
+* Example:
+
+```bash
+evophp entry MyPlugin Dashboard
+```
+
+---
+
 ## Authentication & PAT Storage
 
 When using a command with just `<name>` (e.g. `evophp new plugin MyPlugin`), EvoPHP CLI will:
@@ -165,11 +189,13 @@ When using a command with just `<name>` (e.g. `evophp new plugin MyPlugin`), Evo
 * Automatically store it in `.env.development` for future use
 * Use that token to fetch your GitHub username and manage private/public repos
 
+> ⚠️ You can only create repositories in your own GitHub account.
+
 > To change your token later, simply edit or delete `.env.development`.
 
 ---
 
 ## Further Documentation
 
-More advanced use cases, templates, and configuration details coming soon at:
+More advanced use cases, templates, and configuration details coming soon at:  
 📘 [Official EvoPHP Documentation](#)

package/bin/evophp.js

@@ -9,6 +9,7 @@ yargs(hideBin(process.argv))
   .command(require("../commands/install"))
   .command(require("../commands/uninstall"))
   .command(require("../commands/dependencies"))
+  .command(require("../commands/entry"))
   .command(require("../commands/help"))
   .demandCommand(1, "Please specify a valid command. Use --help to see available commands.")
   .help()

package/commands/entry.js

@@ -0,0 +1,41 @@
+const fs = require("fs");
+const path = require("path");
+const { readLineAsync } = require("../utils/helpers");
+const { addPluginEntry } = require("../utils/entry");
+const log = require("../utils/logger");
+
+module.exports = {
+  command: "entry <plugin> <entry>",
+  aliases: ["e"],
+  describe: "Add a new entry point to a plugin",
+
+  builder: yargs => yargs
+    .positional("plugin", { describe: "Plugin name", type: "string" })
+    .positional("entry", { describe: "Entry folder name", type: "string" })
+    .option("landing", {
+      alias: "l",
+      type: "string",
+      describe: "Landing file name (default: index)"
+    }),
+
+  handler: async ({ plugin, entry, landing }) => {
+    try {
+      // 🛡️ Check if plugin exists
+      const pluginPath = path.join("Public", "Modules", plugin);
+      if (!fs.existsSync(pluginPath)) {
+        log.error(`Plugin '${plugin}' does not exist at ${pluginPath}`);
+        process.exit(1);
+      }
+
+      if (!landing) {
+        landing = await readLineAsync("Landing page filename? (default: index): ") || "index";
+      }
+
+      await addPluginEntry(plugin, entry, landing);
+      log.success(`Entry '${entry}/${landing}' successfully added to plugin '${plugin}'`);
+    } catch (err) {
+      log.error(`Failed to add entry: ${err.message}`);
+      process.exit(1);
+    }
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evophp",
-  "version": "1.1.01",
+  "version": "1.2.0",
   "description": "Command-line installer for the Evolution PHP framework",
   "bin": {
     "evophp": "./bin/evophp.js"

package/utils/entry.js

@@ -0,0 +1,170 @@
+const fs = require("fs");
+const path = require("path");
+const editJsonFile = require("edit-json-file");
+const log = require("./logger");
+const readline = require("readline");
+const { mergeConfig } = require("./helpers");
+
+const readLineAsync = (msg) => {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+  return new Promise((resolve) =>
+    rl.question(msg, (ans) => {
+      rl.close();
+      resolve(ans);
+    })
+  );
+};
+
+/**
+ * Add a new entry point to a plugin with optional custom landing page
+ * Creates both server-side view, JavaScript entry files, and route
+ *
+ * @param {string} pluginName - The plugin name
+ * @param {string} entryName - The entry folder name
+ * @param {string} landing - The landing filename (e.g. index)
+ */
+async function addPluginEntry(pluginName, entryName, landing = "index") {
+  const configPath = path.resolve("config.json");
+
+  if (!fs.existsSync(configPath)) {
+    log.error(`Config file not found: ${configPath}`);
+    return;
+  }
+
+  const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
+
+  // 1. Prompt for route and auth roles
+  const route = await readLineAsync("Enter route path (e.g. dashboard): ");
+
+  // Collect unique role IDs from Auth.roles
+  const rawRoles = Object.values(configJson.Auth?.roles || {}).flatMap((role) =>
+    Array.isArray(role.capacity) ? role.capacity : []
+  );
+  const uniqueRoles = [...new Set(rawRoles.map(String))];
+
+  console.log("Available Role IDs: ", uniqueRoles.join(", "));
+  const auth = await readLineAsync(
+    "Enter role IDs for access (comma separated): "
+  );
+  const authList = auth
+    .split(",")
+    .map((x) => x.trim())
+    .filter(Boolean);
+
+  const pageTitle = await readLineAsync("Enter page title: ");
+
+  // 2. Derive pluginPrefix from Controller filename
+  const controllerDir = path.join("Public", "Modules", pluginName);
+  const controllerFile = fs
+    .readdirSync(controllerDir)
+    .find((f) => f.endsWith("Controller.php"));
+  const pluginPrefix = controllerFile
+    ? controllerFile.replace("Controller.php", "")
+    : pluginName.slice(0, 3).toUpperCase();
+
+  // 3. Normalize entryName with prefix if missing
+  if (!entryName.startsWith(pluginPrefix)) {
+    entryName = pluginPrefix + entryName;
+  }
+
+  const entryPath = `${entryName}/${landing}`;
+
+  // 4. Update root config.json entry
+  const rootConfig = editJsonFile(configPath);
+  const current = rootConfig.get(`modules.${pluginName}`) || {
+    entry: [],
+    active: true,
+    order: 0,
+  };
+
+  if (!current.entry.includes(entryPath)) {
+    current.entry.push(entryPath);
+  }
+
+  rootConfig.set(`modules.${pluginName}`, current);
+  rootConfig.save();
+  log.success(`Added entry "${entryPath}" to ${pluginName} config.`);
+
+  // 5. Update EvoJsDev config.json entry
+  const pluginConfigPath = path.join(
+    "EvoJsDev",
+    "Modules",
+    pluginName,
+    "config.json"
+  );
+  const pluginConfig = editJsonFile(pluginConfigPath);
+  const currentPluginConfig = pluginConfig.get(`modules.${pluginName}`) || {
+    entry: [],
+    active: true,
+    order: 0,
+  };
+
+  if (!currentPluginConfig.entry.includes(entryPath)) {
+    currentPluginConfig.entry.push(entryPath);
+  }
+
+  pluginConfig.set(`modules.${pluginName}`, currentPluginConfig);
+  pluginConfig.save();
+  log.success(`Updated EvoJsDev config with entry "${entryPath}".`);
+
+  // Load templates
+  const bladeContent = fs.readFileSync(
+    path.join(__dirname, "../templates/blade.landing.php"),
+    "utf8"
+  );
+  const jsContent = fs.readFileSync(
+    path.join(__dirname, "../templates/js.entry.js"),
+    "utf8"
+  );
+  const routerContent = fs.readFileSync(
+    path.join(__dirname, "../templates/js.router.js"),
+    "utf8"
+  );
+
+  // 6. Create server-side landing blade file
+  const bladeDir = path.join(
+    "Public",
+    "Modules",
+    pluginName,
+    "Views",
+    entryName
+  );
+  const bladeFile = path.join(bladeDir, `${landing}.blade.php`);
+
+  if (!fs.existsSync(bladeDir)) fs.mkdirSync(bladeDir, { recursive: true });
+  fs.writeFileSync(bladeFile, bladeContent, "utf8");
+  log.success(`Created blade view: ${bladeFile}`);
+
+  // 7. Create JavaScript entry files
+  const jsEntryDir = path.join("EvoJsDev", "Modules", pluginName, entryName);
+  const jsRouterDir = path.join(jsEntryDir, "router");
+
+  if (!fs.existsSync(jsEntryDir)) fs.mkdirSync(jsEntryDir, { recursive: true });
+  if (!fs.existsSync(jsRouterDir)) fs.mkdirSync(jsRouterDir);
+
+  const jsFile = path.join(jsEntryDir, `${landing}.js`);
+  fs.writeFileSync(jsFile, jsContent, "utf8");
+  log.success(`Created JS entry: ${jsFile}`);
+
+  const routerIndex = path.join(jsRouterDir, "index.js");
+  fs.writeFileSync(routerIndex, routerContent, "utf8");
+  log.success(`Created JS router: ${routerIndex}`);
+
+  // 8. Add route to Public/Modules/plugin/Routes.php
+  const routesPath = path.join("Public", "Modules", pluginName, "Routes.php");
+  const routeLine =
+    `$router->get('/${route}', function($params){\n` +
+    `    $controller = new ${pluginPrefix}Controller;\n` +
+    `    $controller->{'${entryPath}'}($params)->auth(${authList.join(
+      ","
+    )})->setData(['pageTitle' => "${pageTitle}"]);\n` +
+    `});\n\n`;
+
+  fs.appendFileSync(routesPath, routeLine, "utf8");
+  log.success(`Route added to ${routesPath}`);
+}
+
+module.exports = { addPluginEntry };

package/utils/helpers.js

@@ -1,5 +1,8 @@
 const readline = require("readline");
 const editJsonFile = require("edit-json-file");
+const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
 
 /**
  * Prompt user for input with a message
@@ -52,78 +55,42 @@ const isObject = (item) =>
 /**
  * Deep merge multiple objects into one
  */
-const mergeDeep = async (target, ...sources) => {
-  if (!sources.length) return target;
-  const source = sources.shift();
-
-  if (isObject(target) && isObject(source)) {
-    for (const key in source) {
-      if (isObject(source[key])) {
-        if (!target[key]) Object.assign(target, { [key]: {} });
-        await mergeDeep(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
+const mergeDeep = async (target, source) => {
+  for (const key in source) {
+    if (isObject(source[key])) {
+      if (!target[key]) target[key] = {};
+      await mergeDeep(target[key], source[key]);
+    } else {
+      target[key] = source[key];
     }
   }
-
-  return mergeDeep(target, ...sources);
+  return target;
 };
 
-/**
- * Merge plugin config into config.json
- */
-const mergeConfig = async (config) => {
-  const file = editJsonFile("./config.json");
-
+const mergeConfig = async (config, filePath = "./config.json") => {
+  const file = editJsonFile(filePath);
   for (const key in config) {
     const existing = file.get(key);
     if (existing === undefined) {
       file.set(key, config[key]);
     } else if (isObject(existing)) {
       const merged = await mergeDeep(existing, config[key]);
+      file.set(key, existing); // ensure file uses the updated object reference
       file.set(key, merged);
     } else {
       file.set(key, config[key]);
     }
   }
-
   file.save();
-};
-
-/**
- * Add a new entry point to a plugin's config.json file
- * @param {string} pluginName - The plugin name
- * @param {string} entryName - The entry directory name
- */
-function addPluginEntry(pluginName, entryName) {
-  const configPath = path.join("EvoJsDev", "Modules", pluginName, "config.json");
-
-  if (!fs.existsSync(configPath)) {
-    log.error(`Config file not found: ${configPath}`);
-    return;
-  }
 
-  const file = editJsonFile(configPath);
-  const entryPath = `${entryName}/index`;
-
-  const current = file.get(`modules.${pluginName}`) || {
-    entry: [],
-    active: true,
-    order: 0
-  };
-
-  if (!current.entry.includes(entryPath)) {
-    current.entry.push(entryPath);
+  // Run build process if entry config changes
+  try {
+    console.log("\n[INFO] Running npm run dev to recompile JS bundle...");
+    execSync("npm run dev", { stdio: "inherit" });
+  } catch (error) {
+    console.error("[ERROR] Failed to run 'npm run dev':", error.message);
   }
-
-  file.set(`modules.${pluginName}`, current);
-  file.save();
-  log.success(`Added entry "${entryPath}" to ${pluginName} config.`);
-}
-
-const fs = require("fs");
-const path = require("path");
+};
 
 /**
  * Save a key-value pair to .env.development (creates or updates)
@@ -156,6 +123,5 @@ module.exports = {
   readLineAsync,
   splitPluginName,
   mergeConfig,
-  addPluginEntry,
   saveToEnv
 };