evophp 1.0.17 → 1.0.19

package/helpers.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const readline = require('readline');
 const rl = readline.createInterface({
     input: process.stdin,

package/install-dependencies.js

@@ -1,147 +1,76 @@
 #!/usr/bin/env node
 
-const { execSync } = require("child_process");
-const path = require("path");
-const fs = require("fs");
-const { readLineAsync } = require(path.resolve(__dirname, 'helpers.js'));
-
-let [, , command, type, name, ...args] = process.argv;
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const { readLineAsync } = require('./helpers');
 
 (async () => {
-  try {
-    if (command === "i" || command === "install") {
-      if (!name) {
-        console.error("Please specify the plugin or theme name.");
-        process.exit(1);
-      }
-
-      console.log(`Installing ${type}: ${name}...`);
-      
-      if (type === "plugin") {
-        try {
-          execSync(`node install-plugin.js ${name}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error installing plugin: ${error.message}`);
-          process.exit(1);
-        }
-      } else if (type === "theme") {
-        try {
-          execSync(`node install-theme.js ${name}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error installing theme: ${error.message}`);
-          process.exit(1);
-        }
-      } else {
-        console.error("Invalid type. Please specify either 'plugin' or 'theme'.");
-        process.exit(1);
-      }
-    } else if (command === "n" || command === "new") {
-      if (!type || !name) {
-        console.error("Please specify both the type (plugin/theme) and name.");
-        process.exit(1);
-      }
-
-      console.log(`Creating a new ${type}: ${name}...`);
-      
-      if (type === "plugin") {
-        try {
-          execSync(`node new-plugin.js ${name}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error creating new plugin: ${error.message}`);
-          process.exit(1);
+    try {
+        let [, , pluginName, ...args] = process.argv;
+
+        if (!pluginName) {
+            console.error("Please specify the plugin or theme name.");
+            process.exit(1);
         }
-      } else if (type === "theme") {
-        try {
-          execSync(`node new-theme.js ${name}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error creating new theme: ${error.message}`);
-          process.exit(1);
+
+        // Check if flags for prod or dev are provided
+        const isProd = true;
+        const isDev = args.includes('--save-dev');
+
+        if (!isProd && !isDev) {
+            console.error("Please specify either '--prod' or '--dev' as flags.");
+            process.exit(1);
         }
-      } else {
-        console.error("Invalid type. Please specify either 'plugin' or 'theme'.");
-        process.exit(1);
-      }
-    } else if (command === "install-dependencies" || command === "d") {
-      if (!name || !type) {
-        console.error("Please specify both the type (plugin) and name.");
-        process.exit(1);
-      }
-
-      console.log(`Running install-dependencies for ${type}: ${name}...`);
-      
-      if (type === "plugin") {
-        try {
-          execSync(`node install-dependencies.js ${name} ${args.join(' ')}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error installing dependencies: ${error.message}`);
-          process.exit(1);
+
+        const depType = isProd ? 'prod' : 'dev';
+
+        const pluginPath = path.join('EvoJsDev', 'Module', pluginName);
+
+        if (!fs.existsSync(pluginPath)) {
+            console.error(`Plugin "${pluginName}" not found in ${pluginPath}.`);
+            process.exit(1);
         }
-      } else {
-        console.error("Install-dependencies only supports plugins currently.");
-        process.exit(1);
-      }
-    } else if (command === "init") {
-      if (!name) {
-        name = await readLineAsync("Enter the name of the plugin/project:");
-        if (!name.trim()) {
-          console.error("Invalid name. Please provide a valid project name.");
-          process.exit(1);
+
+        const dependenciesFile = path.join(pluginPath, 'dependencies.json');
+        let dependencies = {};
+
+        // If dependencies.json exists, read its content
+        if (fs.existsSync(dependenciesFile)) {
+            dependencies = JSON.parse(fs.readFileSync(dependenciesFile, 'utf-8'));
         }
-      }
-
-      console.log(`Initializing new project: ${name}...`);
-
-      try {
-        // Clone the repository
-        console.log("Cloning the Evolution repository...");
-        execSync(
-          `git clone https://github.com/kinsokafor/evolution.git ${name}`,
-          { stdio: "inherit" }
-        );
-
-        // Navigate to the project directory
-        const projectPath = path.join(process.cwd(), name);
-        process.chdir(projectPath);
-
-        // Run `node evolution`
-        console.log(`Running node evolution for project: ${name}...`);
-        execSync(`node evolution ${name}`, { stdio: "inherit" });
-
-        // Install Composer dependencies if applicable
-        if (fs.existsSync("composer.json")) {
-          console.log("Installing Composer dependencies...");
-          execSync("composer install", { stdio: "inherit" });
-        } else {
-          console.log(
-            "Composer file not found, skipping Composer installation."
-          );
+
+        console.log(`Current dependencies in dependencies.json for ${pluginName}:`);
+        console.log("Production dependencies:", dependencies.prod || "None");
+        console.log("Development dependencies:", dependencies.dev || "None");
+
+        // Prompt user for additional dependencies
+        const additionalDeps = await readLineAsync(`Enter additional ${depType} dependencies (comma separated): `);
+        const newDeps = additionalDeps.split(',').map(dep => dep.trim()).filter(dep => dep);
+
+        // Add new dependencies to the respective array
+        if (newDeps.length) {
+            dependencies[depType] = dependencies[depType]
+                ? dependencies[depType] + ' ' + newDeps.join(' ')
+                : newDeps.join(' ');
         }
 
-        // Install NPM dependencies
-        console.log("Installing NPM dependencies...");
-        execSync("npm install", { stdio: "inherit" });
+        // Write updated dependencies to dependencies.json
+        fs.writeFileSync(dependenciesFile, JSON.stringify(dependencies, null, 2), 'utf-8');
+        console.log("Updated dependencies.json successfully.");
+
+        // Install the new dependencies
+        if (newDeps.length) {
+            const installCommand = depType === 'prod' 
+                ? `npm install ${newDeps.join(' ')} --save`   // For prod dependencies
+                : `npm install ${newDeps.join(' ')} --save-dev`; // For dev dependencies
+            console.log(`Installing ${depType} dependencies...`);
+            execSync(installCommand, { stdio: 'inherit' });
+        }
 
-        console.log(
-          "Project initialization complete! Navigate to your project folder:"
-        );
-        console.log(`cd ${name}`);
-      } catch (error) {
-        console.error(`Error initializing project: ${error.message}`);
+        console.log("Dependencies installed successfully.");
+    } catch (error) {
+        console.error("An error occurred:", error.message);
         process.exit(1);
-      }
-    } else {
-      console.error(`Unknown command: "${command}".`);
-      console.log(`
-        Usage:
-          i | install <plugin/theme> <name>     Install a plugin or theme
-          n | new <plugin/theme> <name>         Create a new plugin or theme
-          d | install-dependencies <plugin> <name>  Install dependencies for a plugin
-          init <name>                           Initialize a new project
-        `);
-      process.exit(1);
     }
-  } catch (error) {
-    console.error("An unexpected error occurred:", error.message);
-    process.exit(1);
-  }
 })();

package/install-plugin.js

@@ -1,6 +1,9 @@
+#!/usr/bin/env node
+
 const { execSync } = require('child_process');
 const path = require('path');
-const { readLineAsync, splitPluginName } = require(path.resolve(__dirname, 'helpers.js'));
+const helpersPath = path.resolve(__dirname, 'helpers.js');
+const { readLineAsync, splitPluginName } = require(helpersPath);
 const fs = require('fs');
 
 (async () => {
@@ -34,7 +37,7 @@ const fs = require('fs');
         if (type === 'plugin') {
             paths = [
                 path.join('Public', 'Module', itemName), // Main plugin path
-                path.join('EvoPhpJs', 'Module', itemName), // .js plugin path
+                path.join('EvoJsDev', 'Module', itemName), // .js plugin path
             ];
         } else if (type === 'theme') {
             paths = [path.join('Public', 'Themes', itemName)];
@@ -87,6 +90,7 @@ const fs = require('fs');
         }
 
         console.log(`The ${type} "${itemName}" has been installed successfully.`);
+        process.exit(1);
     } catch (error) {
         console.error("An error occurred while installing:", error.message);
         process.exit(1);

package/installer.js

@@ -10,6 +10,9 @@ let [, , command, type, name] = process.argv;
 (async () => {
   try {
     if (command === "i" || command === "install") {
+      // sample command 
+      // evophp (i | install) (plugin | theme) <author/name>
+
       if (!name) {
         console.error("Please specify the plugin or theme name.");
         process.exit(1);
@@ -26,6 +29,9 @@ let [, , command, type, name] = process.argv;
         process.exit(1);
       }
     } else if (command === "n" || command === "new") {
+      // sample command 
+      // evophp (n | new) (plugin | theme) <author/name>
+
       // Validate type and name
       if (!type || !name) {
         console.error("Please specify the type (plugin/theme) and the name.");
@@ -44,36 +50,38 @@ let [, , command, type, name] = process.argv;
       console.log(`Creating a new ${type}: ${name}...`);
       try {
         const pluginPath = path.resolve(__dirname, "new-plugin.js");
-        console.log(`node "${pluginPath}" ${type} ${name}`)
         execSync(`node "${pluginPath}" ${type} ${name}`, { stdio: "inherit" });
       } catch (error) {
         console.error(`Error creating new ${type}: ${error.message}`);
         process.exit(1);
       }
     } else if (command === "install-dependencies" || command === "d") {
-      if (!name || !type) {
-        console.error("Please specify both the type (plugin) and name.");
+      // sample command 
+      // evophp (d | install-dependencies) <plugin-name> ?(--save-dev | --save)
+      const args = name ? name : [];
+      name = type;
+      if (!name) {
+        console.error("Please specify the name of the plugin.");
         process.exit(1);
       }
 
-      console.log(`Running install-dependencies for ${type}: ${name}...`);
+      console.log(`Running install-dependencies for ${name}...`);
       
-      if (type === "plugin") {
-        try {
-          const pluginPath = path.resolve(__dirname, "install-dependencies.js");
-          execSync(`node "${pluginPath}" ${name} ${args.join(' ')}`, { stdio: "inherit" });
-        } catch (error) {
-          console.error(`Error installing dependencies: ${error.message}`);
-          process.exit(1);
-        }
-      } else {
-        console.error("Install-dependencies only supports plugins currently.");
+      try {
+        const pluginPath = path.resolve(__dirname, "install-dependencies.js");
+        execSync(`node "${pluginPath}" ${name} ${args.join(' ')}`, { stdio: "inherit" });
+      } catch (error) {
+        console.error(`Error installing dependencies: ${error.message}`);
         process.exit(1);
       }
+
     } else if (command === "init") {
+      // sample command 
+      // evophp init ?<projectName>
+
       name = type;
       if (!name) {
-        name = await readLineAsync("Enter the name of the plugin/project:");
+        name = await readLineAsync("Enter the name of the project:");
         if (!name.trim()) {
           console.error("Invalid name. Please provide a valid project name.");
           process.exit(1);

package/new-plugin.js

@@ -1,17 +1,10 @@
 #!/usr/bin/env node
 
-console.log("new-plugin.js is being executed...");
-
 const { execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const axios = require('axios');
 const helpersPath = path.resolve(__dirname, 'helpers.js');
-console.log("Resolved helpers.js path:", helpersPath);
-if (!fs.existsSync(helpersPath)) {
-    console.error("helpers.js not found at path:", helpersPath);
-    process.exit(1);
-}
 const { readLineAsync, splitPluginName } = require(helpersPath);
 
 (async () => {
@@ -66,7 +59,7 @@ const { readLineAsync, splitPluginName } = require(helpersPath);
             await createGitHubRepo(gitHubToken, templateRepo, `${itemName}.js`);
 
             // Clone the newly created repositories
-            cloneDir = path.join('EvoPhpJs', 'Modules', itemName);
+            cloneDir = path.join('EvoJsDev', 'Modules', itemName);
             await cloneRepository(author, itemName, cloneDir);
 
         } else if (type === 'theme') {
@@ -125,7 +118,7 @@ async function cloneRepository(author, itemName, cloneDir) {
     try {
         // Ensure directories do not exist before cloning
         if (fs.existsSync(cloneDir)) {
-            console.log(`The ${type} "${itemName}" already exists in the directory. Exiting.`);
+            console.log(`The plugin "${itemName}" already exists in the directory. Exiting.`);
             process.exit(0);
         }
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evophp",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "Installer for the Evolution PHP project",
   "main": "installer.js",
   "scripts": {