@cocreate/cli 1.48.0 → 1.50.0

package/src/commands/bump.js

@@ -1,92 +1,154 @@
-let fs = require('fs');
-const path = require("path")
-const util = require('node:util');
-const exec = util.promisify(require('node:child_process').exec);
-const { color } = require('../fonts');
-
-let pathList, nameList, item = {}, failed = [];
-
-module.exports = async function bump(repos, args) {
-    pathList = repos.map(o => o.absolutePath)
-    if (repos.length <= 1) {
-        let packageJsonPath = path.resolve(process.cwd(), 'package.json');
-
-        if (fs.existsSync(packageJsonPath)) {
-            let json = require(packageJsonPath)
-            if (json) {
-                let dependencies = json.dependencies || {}
-                let devDependencies = json.devDependencies || {}
-                let object = { ...dependencies, ...devDependencies }
-                for (let key of Object.keys(object)) {
-                    if (key.startsWith("@cocreate/")) {
-                        const version = await exec(`npm view ${key} version`);
-                        item[key] = `^${version.stdout}`.trim()
-                    }
-                }
-                console.log('bump versions', item)
-
-                for (let name of Object.keys(item)) {
-                    bumpVersion(packageJsonPath, name)
-                }
-            }
-        }
-
-    } else {
-        nameList = pathList.map(fn => path.basename(fn).toLowerCase());
-        for (let [index, name] of nameList.entries()) {
-            getVersions(path.resolve(pathList[index], 'package.json'), `@${name}`)
-        }
-
-        console.log('bump versions', item)
-
-        for (let [index, name] of nameList.entries()) {
-            bumpVersion(path.resolve(pathList[index], 'package.json'), name)
-        }
-
-    }
-
-    console.log('completed')
-    return failed;
-}
+// Import necessary modules
+let fs = require("fs"); // File system module
+const path = require("path"); // Path module for handling file paths
+const util = require("node:util"); // Utility module for different helper functions
+const exec = util.promisify(require("node:child_process").exec); // Promisified version of exec
+const createSpinner = require("../spinner"); // Import custom spinner module
+
+// Initialize variables to use throughout the module update process
+let pathList = [], // Array to store paths to package.json files
+	item = {}, // Object to store the latest versions of modules
+	failed = []; // Array to track any failures that occur
+
+let promiseMap = new Map(); // A map to cache promises for fetching versions
+
+/**
+ * Updates module versions across multiple repositories.
+ * @param {Array} repos - An array of repository objects containing `absolutePath`.
+ * @param {Object} args - Additional arguments for the update process (not used here but passed for potential future use).
+ * @returns {Promise<Array>} - Resolves with the list of failed update attempts.
+ */
+module.exports = async function update(repos, args) {
+	pathList = repos.map((o) => path.resolve(o.absolutePath, "package.json"));
+
+	// Start a spinner to indicate progress
+	const spinner = createSpinner({
+		prefix: "Waiting for all versions to be fetched"
+	});
+
+	// Trigger version fetching for each package.json path
+	for (let filePath of pathList) {
+		getVersions(filePath);
+	}
+
+	// Await the resolution of all version fetching promises
+	await Promise.all(promiseMap.values());
+
+	// Populate the 'item' object with fetched versions
+	for (let [key, promise] of promiseMap) {
+		const version = await promise;
+		if (version) {
+			item[key] = `^${version}`;
+		}
+	}
+
+	// End spinner as fetching process is complete
+	spinner.end();
 
+	// Update each package.json with new version data
+	for (let filePath of pathList) {
+		updateVersion(filePath);
+	}
+
+	console.log("Completed updating modules to their latest versions.");
+	return failed;
+};
+
+/**
+ * Fetches the latest versions of dependencies listed in a package.json file.
+ * @param {string} filePath - The path to the package.json file.
+ */
 function getVersions(filePath) {
-    if (fs.existsSync(filePath)) {
-        let object = require(filePath)
-        if (object.name && object.version) {
-            item[object.name] = `^${object.version}`
-        }
-    } else {
-        failed.push({ name: 'get version', des: 'path doesn\'t exist:' + filePath })
-    }
+	if (fs.existsSync(filePath)) {
+		let object = require(filePath); // Load JSON content
+		const dependencies = object.dependencies || {}; // Current dependencies
+		const devDependencies = object.devDependencies || {}; // Current devDependencies
+		const allDependencies = { ...dependencies, ...devDependencies }; // Combine both
+
+		// Iterate over each dependency
+		for (const key of Object.keys(allDependencies)) {
+			// Check and process only @cocreate/ prefixed packages
+			if (key.startsWith("@cocreate/") && !promiseMap.has(key)) {
+				const promise = exec(`npm view ${key} version`)
+					.then((versionObj) => versionObj.stdout.trim())
+					.catch((error) => {
+						failed.push({ name: key, error: error.message });
+						console.error(
+							`Failed fetching version for ${key}: ${error.message}`
+						);
+						return null;
+					});
+				promiseMap.set(key, promise);
+			}
+		}
+	} else {
+		const errorMessage = `Path doesn't exist: ${filePath}`;
+		failed.push({
+			name: "get version",
+			error: errorMessage
+		});
+		console.error(errorMessage);
+	}
 }
 
-function bumpVersion(filePath, name) {
-    if (fs.existsSync(filePath)) {
-
-        let object = require(filePath)
-        if (object) {
-            let newObject = { ...object }
-            let dependencies = object.dependencies || {}
-            let devDependencies = object.devDependencies || {}
-            for (const name of Object.keys(dependencies)) {
-                if (item[name]) {
-                    newObject.dependencies[name] = item[name]
-                }
-            }
-
-            for (const name of Object.keys(devDependencies)) {
-                if (item[name]) {
-                    newObject.devDependencies[name] = item[name]
-                }
-            }
-
-            if (fs.existsSync(filePath)) {
-                fs.unlinkSync(filePath)
-            }
-
-            fs.writeFileSync(filePath, JSON.stringify(object, null, 2))
-        }
-    } else {
-        failed.push({ name: 'bump version', des: 'path doesn\'t exist:' + filePath })
-    }
+/**
+ * Updates the package.json file with the latest module versions.
+ * @param {string} filePath - The path to the package.json file.
+ */
+function updateVersion(filePath) {
+	if (fs.existsSync(filePath)) {
+		delete require.cache[require.resolve(filePath)];
+		const object = require(filePath);
+
+		if (object) {
+			const dependencies = object.dependencies || {};
+			const devDependencies = object.devDependencies || {};
+			const allDependencies = { ...dependencies, ...devDependencies };
+
+			let updated = false;
+			let newObject = { ...object };
+
+			for (let key of Object.keys(allDependencies)) {
+				if (!key.startsWith("@cocreate/")) continue;
+				const currentVersion = allDependencies[key];
+				const latestVersion = item[key];
+
+				if (latestVersion && latestVersion !== currentVersion) {
+					if (dependencies[key]) {
+						newObject.dependencies[key] = latestVersion;
+					}
+					if (devDependencies[key]) {
+						newObject.devDependencies[key] = latestVersion;
+					}
+
+					updated = true;
+					console.log(
+						`Updated ${key} from ${currentVersion} to ${latestVersion}.`
+					);
+				} else {
+					if (latestVersion === null) {
+						console.log(
+							`Could not update ${key}: Failed to fetch the latest version.`
+						);
+					} else {
+						console.log(
+							`Skipped updating ${key}, already at the latest version: ${currentVersion}.`
+						);
+					}
+				}
+			}
+
+			if (updated) {
+				fs.writeFileSync(filePath, JSON.stringify(newObject, null, 2));
+				console.log(`Updated ${filePath} successfully.`);
+			}
+		}
+	} else {
+		const errorMessage = `Path doesn't exist: ${filePath}`;
+		failed.push({
+			name: "update version",
+			error: errorMessage
+		});
+		console.error(errorMessage);
+	}
 }

package/src/commands/clone.js

@@ -1,28 +1,32 @@
-const spawn = require('../spawn');
-const path = require('path');
-let fs = require('fs');
+const spawn = require("../spawn");
+const path = require("path");
+let fs = require("fs");
 
 module.exports = async function gitClone(repos, args) {
-    const failed = [];
-    const cwdPath = path.resolve(process.cwd());
+	const failed = [];
+	const cwdPath = path.resolve(process.cwd());
 
-    for (let i = 0; i < repos.length; i++) {
-        // TODO: Check if path exist and if git.config or package.json  exist continue
-        if (cwdPath !== repos[i].absolutePath) {
-            if (!fs.existsSync(repos[i].directory))
-                fs.mkdirSync(repos[i].directory);
+	for (let i = 0; i < repos.length; i++) {
+		// TODO: Check if path exist and if git.config or package.json  exist continue
+		if (cwdPath !== repos[i].absolutePath) {
+			if (!fs.existsSync(repos[i].directory))
+				fs.mkdirSync(repos[i].directory);
 
-            if (!repos[i].repo.startsWith('http://') && !repos[i].repo.startsWith('https://'))
-                repos[i].repo = 'https://' + repos[i].repo
+			if (
+				!repos[i].repo.startsWith("http://") &&
+				!repos[i].repo.startsWith("https://")
+			)
+				repos[i].repo = "https://" + repos[i].repo;
 
-            let exitCode = await spawn('git', ['clone', `${repos[i].repo}`], { stdio: 'inherit', cwd: repos[i].directory })
-            if (exitCode !== 0) {
-                failed.push({ name: repos[i].name, des: `cloning failed` })
-            }
+			let exitCode = await spawn("git", ["clone", `${repos[i].repo}`], {
+				stdio: "inherit",
+				cwd: repos[i].directory
+			});
+			if (exitCode !== 0) {
+				failed.push({ name: repos[i].name, error: `cloning failed` });
+			}
+		}
+	}
 
-        }
-    }
-
-    return failed;
-
-}
+	return failed;
+};

package/src/commands/fs/automated.js

@@ -1,26 +1,65 @@
-let glob = require("glob");
-let fs = require('fs');
+const fs = require("fs");
+const path = require("path");
 
-function globUpdater(er, files) {
+function findDirectories(startPath, callback, fileName) {
+  // Resolve relative paths to absolute paths if needed
+  const resolvedPath =
+    startPath.startsWith("./") || startPath.startsWith("../")
+      ? path.resolve(startPath)
+      : startPath;
 
-    if (er)
-        console.log(files, 'glob resolving issue')
-    else
-        files.forEach(filename => {
-            update(filename + 'automated.yml')
-        })
-    console.log('Completed')
+  const segments = resolvedPath.split("/"); // Split path by '/'
+  let currentPath = "/"; // Start from root
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    const isWildcard = segment === "*";
+
+    if (isWildcard) {
+      // Get all directories at this level
+      const directories = fs
+        .readdirSync(currentPath)
+        .filter((file) =>
+          fs.statSync(path.join(currentPath, file)).isDirectory()
+        );
+
+      // Process each directory and continue along the path
+      directories.forEach((dir) => {
+        findDirectories(
+          path.join(currentPath, dir, ...segments.slice(i + 1)),
+          callback,
+          fileName
+        );
+      });
+      return; // Stop further processing in the loop for wildcard case
+    } else {
+      // Continue to the next part of the path
+      currentPath = path.join(currentPath, segment);
+
+      // If a segment doesn’t exist or isn’t a directory, log an error and stop
+      if (
+        !fs.existsSync(currentPath) ||
+        !fs.statSync(currentPath).isDirectory()
+      ) {
+        console.log(`Directory not found: ${currentPath}`);
+        return;
+      }
+    }
+  }
+
+  // If we reach the end of the path without wildcards, we have a valid directory
+  callback(currentPath, fileName);
 }
 
-function update(YmlPath) {
-    let build = `- name: Build
-        run: yarn build`
+function createOrUpdateFile(directoryPath, fileName) {
+  let buildStep = `- name: Build\n        run: yarn build`;
 
-    let webpackPath = YmlPath.replace('.github/workflows/automated.yml', 'webpack.config.js')
-    if (!fs.existsSync(webpackPath))
-        build = ''
+  // Check if webpack config exists to include build step
+  const webpackPath = filePath.replace(fileName, "webpack.config.js");
+  if (!fs.existsSync(webpackPath)) buildStep = "";
 
-    let fileContent = `name: Automated Workflow
+  // Define file content (e.g., for YAML or other configuration)
+  const fileContent = `name: Automated Workflow
 on:
   push:
     branches:
@@ -80,7 +119,7 @@ jobs:
         run: echo "//registry.npmjs.org/:_authToken=\${{ secrets.NPM_TOKEN }}" > ~/.npmrc
       - name: Install dependencies
         run: yarn install
-      ${build}
+      ${buildStep}
       - name: Set Environment Variables
         run: |
           echo "organization_id=\${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
@@ -88,22 +127,33 @@ jobs:
           echo "host=\${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
       - name: CoCreate Upload
         run: coc upload
-
 `;
-    if (fs.existsSync(YmlPath))
-        fs.unlinkSync(YmlPath)
-    fs.writeFileSync(YmlPath, fileContent)
 
+  const filePath = path.join(directoryPath, fileName);
+  // Create or update the file
+  if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
+  fs.writeFileSync(filePath, fileContent);
 }
 
+// Define the directories with wildcards
+const directories = [
+  "../../../../../CoCreate-modules/*/",
+  "../../../../../CoCreate-apps/*/",
+  "../../../../../CoCreate-plugins/*/",
+  "../../../../../CoCreateCSS/",
+  "../../../../../CoCreateJS/",
+  "../../../../../CoCreateWS/",
+  "../../../../../YellowOracle/",
+  "../../../../../CoCreate-website/",
+  "../../../../../CoCreate-admin/",
+  "../../../../../CoCreate-website-old/",
+  "../../../../../CoCreate-superadmin/",
+];
+const fileName = "automated.yml";
 
+// Execute directory search and create/update file if the directory exists
+directories.forEach((directory) => {
+  findDirectories(directory, createOrUpdateFile, fileName);
+});
 
-// glob("/home/cocreate/CoCreate/CoCreate-components/CoCreate-actions/.github/workflows", globUpdater)
-glob("/home/cocreate/CoCreate/CoCreate-components/*/.github/workflows/", globUpdater)
-// glob("/home/cocreate/CoCreate/CoCreate-apps/*/.github/workflows/", globUpdater)
-// glob("/home/cocreate/CoCreate/CoCreate-plugins/*/.github/workflows/", globUpdater)
-
-// glob("/home/cocreate/CoCreate/CoCreate-admin/.github/workflows/", globUpdater)
-// glob("/home/cocreate/CoCreate/CoCreateCSS/.github/workflows/", globUpdater)
-// glob("/home/cocreate/CoCreate/CoCreateJS/.github/workflows/", globUpdater)
-// glob("/home/cocreate/CoCreate/CoCreate-wesite/.github/workflows/", globUpdater)
+console.log("Finished");

package/src/commands/fs/config.js

@@ -1,30 +1,72 @@
-let glob = require("glob");
-let fs = require('fs');
+const fs = require("fs");
 const path = require("path");
 
-function globUpdater(er, files) {
-    if (er)
-        console.log(files, 'glob resolving issue');
-    else
-        files.forEach(filename => update(filename));
-}
+function findDirectories(startPath, callback, fileName) {
+  // Resolve relative paths to absolute paths if needed
+  const resolvedPath =
+    startPath.startsWith("./") || startPath.startsWith("../")
+      ? path.resolve(startPath)
+      : startPath;
 
+  const segments = resolvedPath.split("/"); // Split path by '/'
+  let currentPath = "/"; // Start from root
 
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    const isWildcard = segment === "*";
 
+    if (isWildcard) {
+      // Get all directories at this level
+      const directories = fs
+        .readdirSync(currentPath)
+        .filter((file) =>
+          fs.statSync(path.join(currentPath, file)).isDirectory()
+        );
 
-function update(MdPath) {
-    let name = path.basename(path.resolve(path.dirname(MdPath), './')).substring(9);
-    let object = '';
-    let replaceContent = fs.readFileSync(MdPath).toString();
+      // Process each directory and continue along the path
+      directories.forEach((dir) => {
+        findDirectories(
+          path.join(currentPath, dir, ...segments.slice(i + 1)),
+          callback,
+          fileName
+        );
+      });
+      return; // Stop further processing in the loop for wildcard case
+    } else {
+      // Continue to the next part of the path
+      currentPath = path.join(currentPath, segment);
 
+      // If a segment doesn’t exist or isn’t a directory, log an error and stop
+      if (
+        !fs.existsSync(currentPath) ||
+        !fs.statSync(currentPath).isDirectory()
+      ) {
+        console.log(`Directory not found: ${currentPath}`);
+        return;
+      }
+    }
+  }
 
-    let content_source = replaceContent.substring(replaceContent.indexOf("sources"));
-    let content1 = content_source.substring(content_source.indexOf("object"));
-    let content2 = content1.substring(content1.indexOf(':'));
-    object = content2.substring(3, content2.indexOf(',') - 4);
+  // If we reach the end of the path without wildcards, we have a valid directory
+  callback(currentPath, fileName);
+}
 
+function createOrUpdateFile(directoryPath, fileName) {
+  let name = path
+    .basename(path.resolve(path.dirname(directoryPath), "./"))
+    .substring(9);
+  let object = "";
+  let replaceContent = fs.readFileSync(directoryPath).toString();
 
-    let fileContent = `module.exports = {
+  // Parse content to extract `object`
+  let content_source = replaceContent.substring(
+    replaceContent.indexOf("sources")
+  );
+  let content1 = content_source.substring(content_source.indexOf("object"));
+  let content2 = content1.substring(content1.indexOf(":"));
+  object = content2.substring(3, content2.indexOf(",") - 4);
+
+  let fileContent = `module.exports = {
     "config": {
         "organization_id": "5ff747727005da1c272740ab",
         "key": "2061acef-0451-4545-f754-60cf8160",
@@ -37,7 +79,7 @@ function update(MdPath) {
             "object": {
                 "_id": "${object}",
                 "name": "index.html",
-                 "path": "/docs/${name}",
+                "path": "/docs/${name}",
                 "pathname": "/docs/${name}/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
@@ -50,28 +92,42 @@ function update(MdPath) {
         }
     ]
 }
-
 `;
 
-    if (!object.length)
-        console.log("object Undefined: ", MdPath);
-    if (object.length != 24 && object.length != 0)
-        console.log("object not valid! please check your config: ", MdPath);
-    else {
-        console.log(MdPath, " -> object : ", object);
-        if (fs.existsSync(MdPath))
-            fs.unlinkSync(MdPath);
-        fs.writeFileSync(MdPath, fileContent);
-
-    }
-
+  if (!object.length) {
+    console.log("object Undefined: ", directoryPath);
+  } else if (object.length !== 24) {
+    console.log("object not valid! Please check your config: ", directoryPath);
+  } else {
+    const filePath = path.join(directoryPath, fileName);
+    if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
+    fs.writeFileSync(filePath, fileContent);
+  }
+  const filePath = path.join(directoryPath, fileName);
+  // Create or update the file
+  if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
+  fs.writeFileSync(filePath, fileContent);
 }
 
-// glob("../../CoCreate-components/CoCreate-filter/CoCreate.config.js", globUpdater);
-glob("../../CoCreate-components/*/CoCreate.config.js", globUpdater);
-glob("../../CoCreate-apps/*/CoCreate.config.js", globUpdater);
-glob("../../CoCreate-plugins/*/CoCreate.config.js", globUpdater);
-// glob("../CoCreateCSS/CoCreate.config.js", globUpdater);
-// glob("../CoCreateJS/CoCreate.config.js", globUpdater);
+// Define the directories with wildcards
+const directories = [
+  "../../../../../CoCreate-modules/*/",
+  "../../../../../CoCreate-apps/*/",
+  "../../../../../CoCreate-plugins/*/",
+  "../../../../../CoCreateCSS/",
+  "../../../../../CoCreateJS/",
+  "../../../../../CoCreateWS/",
+  "../../../../../YellowOracle/",
+  "../../../../../CoCreate-website/",
+  "../../../../../CoCreate-admin/",
+  "../../../../../CoCreate-website-old/",
+  "../../../../../CoCreate-superadmin/",
+];
+const fileName = "CoCreate.config.js";
+
+// Execute directory search and create/update file if the directory exists
+directories.forEach((directory) => {
+  findDirectories(directory, createOrUpdateFile, fileName);
+});
 
-console.log('finished');
+console.log("Finished");

package/src/commands/fs/gitignore.js

@@ -1,41 +1,32 @@
 let glob = require("glob");
-let fs = require('fs');
-const path = require("path")
+let fs = require("fs");
+const path = require("path");
 
 function globUpdater(er, files) {
-    if (er)
-        console.log(files, 'glob resolving issue')
-    else
-        files.forEach(filename => update(filename))
+  if (er) console.log(files, "glob resolving issue");
+  else files.forEach((filename) => update(filename));
 }
 
-
-
-
 function update(Path) {
-    let fileContent = `# ignore
+  let fileContent = `# ignore
 node_modules
 dist
 .npmrc
 
 `;
-    if (fs.existsSync(Path))
-        fs.unlinkSync(Path)
-    fs.writeFileSync(Path, fileContent) 
-
+  if (fs.existsSync(Path)) fs.unlinkSync(Path);
+  fs.writeFileSync(Path, fileContent);
 }
 
-
-
-// glob("../CoCreate-components/CoCreate-action/.gitignore", globUpdater)
+// glob("../CoCreate-modules/CoCreate-action/.gitignore", globUpdater)
 // glob("./.gitignore", globUpdater)
 // glob("../CoCreate-adminUI/.gitignore", globUpdater)
-glob("../CoCreate-components/*/.gitignore", globUpdater)
-glob("../CoCreate-apps/*/.gitignore", globUpdater)
-glob("../CoCreate-plugins/*/.gitignore", globUpdater)
+glob("../CoCreate-modules/*/.gitignore", globUpdater);
+glob("../CoCreate-apps/*/.gitignore", globUpdater);
+glob("../CoCreate-plugins/*/.gitignore", globUpdater);
 // glob("../CoCreate-website/.gitignore", globUpdater)
 // glob("../CoCreate-website-template/.gitignore", globUpdater)
-glob("../CoCreateCSS/.gitignore", globUpdater)
+glob("../CoCreateCSS/.gitignore", globUpdater);
 // glob("../CoCreateJS/.gitignore", globUpdater)
 
-console.log('finished')
+console.log("finished");