evophp 1.0.25 → 1.0.27

package/helpers.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 const readline = require('readline');
+const editJsonFile = require("edit-json-file");
 
 /**
  * Prompt user for input with a message
@@ -52,4 +53,49 @@ const splitPluginName = async (name) => {
     return arr;
 };
 
-module.exports = { readLineAsync, splitPluginName };
+const isObject = (item) => {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+/**
+ * Deep merge two objects.
+ * @param target
+ * @param ...sources
+ */
+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]: {} });
+                mergeDeep(target[key], source[key]);
+            } else {
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+
+    return mergeDeep(target, ...sources);
+}
+
+const mergeConfig = async (config) => {
+    let file = editJsonFile("./config.json");
+    for(var data in config) {
+        const oldValue = file.get(data);
+        if(oldValue == undefined) {
+            file.set(data, config[data]);
+        } else {
+            if(isObject(oldValue)) {
+                var deep = await mergeDeep(oldValue, config[data]);
+                file.set(data, deep);
+            } else {
+                file.set(data, config[data]);
+            }
+        }  
+    }
+    file.save();
+}
+
+module.exports = { readLineAsync, splitPluginName, mergeConfig };

package/install-dependencies.js

@@ -25,7 +25,7 @@ const { readLineAsync } = require('./helpers');
 
         const depType = isProd ? 'prod' : 'dev';
 
-        const pluginPath = path.join('EvoJsDev', 'Module', pluginName);
+        const pluginPath = path.join('EvoJsDev', 'Modules', pluginName);
 
         if (!fs.existsSync(pluginPath)) {
             console.error(`Plugin "${pluginName}" not found in ${pluginPath}.`);
@@ -50,9 +50,9 @@ const { readLineAsync } = require('./helpers');
 
         // Add new dependencies to the respective array
         if (newDeps.length) {
-            dependencies[depType] = dependencies[depType]
+            dependencies[depType] = (dependencies[depType]
                 ? dependencies[depType] + ' ' + newDeps.join(' ')
-                : newDeps.join(' ');
+                : newDeps.join(' ')).trim().split(' ').filter((value, index, array) => array.indexOf(value) === index).join(' ');
         }
 
         // Write updated dependencies to dependencies.json

package/install-plugin.js

@@ -3,7 +3,7 @@
 const { execSync } = require('child_process');
 const path = require('path');
 const helpersPath = path.resolve(__dirname, 'helpers.js');
-const { readLineAsync, splitPluginName } = require(helpersPath);
+const { readLineAsync, splitPluginName, mergeConfig } = require(helpersPath);
 const fs = require('fs');
 
 (async () => {
@@ -36,8 +36,8 @@ const fs = require('fs');
         let paths;
         if (type === 'plugin') {
             paths = [
-                path.join('Public', 'Module', itemName), // Main plugin path
-                path.join('EvoJsDev', 'Module', itemName), // .js plugin path
+                path.join('Public', 'Modules', itemName), // Main plugin path
+                path.join('EvoJsDev', 'Modules', itemName), // .js plugin path
             ];
         } else if (type === 'theme') {
             paths = [path.join('Public', 'Themes', itemName)];
@@ -63,6 +63,12 @@ const fs = require('fs');
             const jsRepoURL = `https://github.com/${author}/${itemName}.js.git`;
             execSync(`git clone ${jsRepoURL} ${paths[1]}`, { stdio: 'inherit' });
 
+            const configFile = path.resolve(`./EvoJsDev/Modules/${itemName}/config.json`)
+            if (fs.existsSync(configFile)) {
+                const pluginConfig = require(configFile)
+                mergeConfig(pluginConfig)
+            }
+
             // Check for dependencies.json in the .js plugin path
             const dependenciesFile = path.join(paths[1], 'dependencies.json');
             if (fs.existsSync(dependenciesFile)) {
@@ -90,7 +96,6 @@ 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

@@ -58,7 +58,8 @@ let [, , command, type, name] = process.argv;
     } else if (command === "install-dependencies" || command === "d") {
       // sample command 
       // evophp (d | install-dependencies) <plugin-name> ?(--save-dev | --save)
-      const args = name ? name : [];
+      const args = name ? [name] : [];
+      console.log(args)
       name = type;
       if (!name) {
         console.error("Please specify the name of the plugin.");

package/new-plugin.js

@@ -5,7 +5,8 @@ const path = require('path');
 const fs = require('fs');
 const axios = require('axios');
 const helpersPath = path.resolve(__dirname, 'helpers.js');
-const { readLineAsync, splitPluginName } = require(helpersPath);
+const { readLineAsync, splitPluginName, mergeConfig } = require(helpersPath);
+const rimraf = require('rimraf');
 
 (async () => {
     try {
@@ -87,7 +88,7 @@ const { readLineAsync, splitPluginName } = require(helpersPath);
                     });
                 } catch(e) {}
                 
-                const configFile = path.resolve(__dirname, `./EvoJsDev/Modules/${pluginName}/config.json`)
+                const configFile = path.resolve(`./EvoJsDev/Modules/${pluginName}/config.json`)
                 if (fs.existsSync(configFile)) {
                     const pluginConfig = require(configFile)
                     mergeConfig(pluginConfig)
@@ -101,7 +102,7 @@ const { readLineAsync, splitPluginName } = require(helpersPath);
                 pluginPrefix: pluginPrefix
             })
             
-            if (fs.existsSync(path.resolve(__dirname, `./Public/Modules/${pluginName}/Controller.php`))) {
+            if (fs.existsSync(path.resolve(`./Public/Modules/${pluginName}/Controller.php`))) {
                 await editFile(`./Public/Modules/${pluginName}/Controller.php`, {
                     pluginName: pluginName,
                     pluginPrefix: pluginPrefix
@@ -186,23 +187,55 @@ async function createGitHubRepo(token, templateRepo, pluginName) {
     }
 }
 
-// Function to clone the newly created repository
+// Function to clone the newly created repository with retry mechanism
 async function cloneRepository(author, pluginName, cloneDir) {
     try {
+        const cloneUrl = `https://github.com/${author}/${pluginName}.git`;
+
         // Ensure directories do not exist before cloning
         if (fs.existsSync(cloneDir)) {
             console.log(`The plugin "${pluginName}" already exists in the directory. Exiting.`);
-            process.exit(0);
+            return;
         }
-        
-        const cloneUrl = `https://github.com/${author}/${pluginName}.git`;
 
         console.log(`Cloning ${author}/${pluginName}.git from GitHub...`);
-        execSync(`git clone ${cloneUrl} ${cloneDir}`, { stdio: 'inherit' });
 
-        console.log(`Cloned the repository ${pluginName} successfully.`);
+        let retries = 5;
+        while (retries > 0) {
+            try {
+                if (fs.existsSync(cloneDir)) {
+                    console.log(`The directory "${cloneDir}" already exists. Deleting it...`);
+        
+                    // Use rimraf to delete the directory and its contents
+                    rimraf.sync(cloneDir);
+                    console.log(`The directory "${cloneDir}" was deleted.`);
+                }
+                execSync(`git clone ${cloneUrl} ${cloneDir}`, { stdio: 'inherit' });
+
+                // Check if the cloned repository is non-empty
+                const files = fs.readdirSync(cloneDir).filter(file => file !== '.git');
+                if (files.length > 0) {
+                    console.log(`Cloned the repository ${pluginName} successfully.`);
+                    return;
+                } else {
+                    console.warn("Repository appears to be empty. Retrying...");
+                    retries--;
+                    await new Promise(resolve => setTimeout(resolve, 3000)); // Wait for 3 seconds before retrying
+                }
+            } catch (error) {
+                console.error(`Error during cloning attempt: ${error.message}`);
+                retries--;
+                if (retries > 0) {
+                    console.log(`Retrying... (${5 - retries}/5)`);
+                    await new Promise(resolve => setTimeout(resolve, 3000)); // Wait for 3 seconds before retrying
+                }
+            }
+        }
+
+        console.error(`Failed to clone the repository ${pluginName} after multiple attempts.`);
+        process.exit(1);
     } catch (error) {
-        console.error(`Error cloning the repository ${pluginName}:`, error.message);
+        console.error(`Unexpected error while cloning the repository ${pluginName}:`, error.message);
         process.exit(1);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evophp",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Installer for the Evolution PHP project",
   "main": "installer.js",
   "scripts": {
@@ -10,7 +10,9 @@
     "evophp": "installer.js"
   },
   "dependencies": {
-    "axios": "^1.7.9"
+    "axios": "^1.7.9",
+    "edit-json-file": "^1.8.0",
+    "rimraf": "^6.0.1"
   },
   "files": [
     "installer.js",
@@ -20,4 +22,3 @@
     "helpers.js"
   ]
 }
-