@cocreate/cli 1.51.2 → 1.52.0

package/package.json

@@ -1,18 +1,10 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.51.2",
+  "version": "1.52.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
-    "cocreate",
-    "low-code-framework",
-    "no-code-framework",
-    "cocreatejs",
-    "cocreatejs-component",
-    "cocreate-framework",
-    "no-code",
     "low-code",
-    "collaborative-framework",
     "realtime",
     "realtime-framework",
     "collaboration",

package/src/coc.js

@@ -2,11 +2,11 @@
 
 // Import necessary modules for path operations, file system operations, and more
 const path = require("path");
-const fs = require("fs");
 const readline = require("readline");
 const execute = require("./execute");
 const addMeta = require("./addMeta");
 const { color } = require("./fonts");
+const { getConfig } = require("./getConfig");
 
 // Configuration object for storing options
 let config = {};
@@ -15,41 +15,36 @@ let config = {};
 const argv = process.argv.slice(2);
 
 // Define available command-line options
-const options = ["-self"];
-
-// Iterate over available options and set configurations if specified in argv
-for (let option of options) {
-	if (argv.includes(option)) {
-		config[option.replace(/^--/, "")] = true;
-		const index = argv.indexOf(option);
-		delete argv[index];
+const availableOptions = {
+	"--self": { key: "self", type: "boolean" },
+	"-s": { key: "self", type: "boolean" },
+	"--directory": { key: "directory", type: "string" },
+	"-d": { key: "directory", type: "string" },
+	"--config": { key: "config", type: "string" },
+	"-c": { key: "config", type: "string" }
+};
+
+const options = {};
+const commandParts = [];
+for (let i = 0; i < argv.length; i++) {
+	let option = availableOptions[argv[i]];
+	if (option) {
+		if (option.type === "boolean") {
+			options[option.key] = true;
+		} else if (option.type === "string") {
+			options[option.key] = argv[i + 1];
+			argv.splice(i + 1, 1);
+		}
+	} else {
+		if (argv[i].match(/[\s'"]/)) {
+			commandParts.push(`'${argv[i].replace(/'/g, "\\'")}'`);
+		} else {
+			commandParts.push(argv[i]);
+		}
 	}
 }
 
-// Format command from argv, handling spaces and quotes
-command = argv
-	.map((part) => (part.match(/ |'|"/) ? `'${part.replace(/'/, "'")}'` : part))
-	.join(" ");
-
-/**
- * Load repository configuration from the given path.
- * @param {string} path - The file path to load repository config from.
- * @returns {Array} - List of repositories.
- */
-function getRepositories(path) {
-	try {
-		const config = require(path);
-		return config.repositories;
-	} catch (err) {
-		console.error(
-			color.red + "cannot read repository file in" + color.reset,
-			path,
-			color.red + "error:" + color.reset,
-			err.message
-		);
-		process.exit(1);
-	}
-}
+command = commandParts.join(" ");
 
 /**
  * Main function to execute commands across repositories.
@@ -57,68 +52,60 @@ function getRepositories(path) {
  * @param {Array} [repos=null] - List of repositories to process.
  * @param {string} [directory=null] - The directory path of the configuration.
  */
-async function main(config = {}, repos = null, directory = null) {
-	if (!repos) {
-		// Determine repositories and configuration file paths
-		const currentRepoPath = path.resolve(
-			process.cwd(),
-			"CoCreate.config.js"
-		);
-		const packageJsonPath = path.resolve(process.cwd(), "package.json");
-
-		// Load repositories from specified config file
-		if (config["c"] && fs.existsSync(config["c"])) {
-			repos = getRepositories(config["c"]);
-			directory = path.dirname(config["c"]);
-			console.warn(
-				`${color.yellow}using ${config["c"]} configuration${color.reset}`
-			);
-		}
-		// Load repositories from default CoCreate.config.js if exists
-		else if (!config["self"] && fs.existsSync(currentRepoPath)) {
-			repos = getRepositories(currentRepoPath);
-			directory = path.dirname(currentRepoPath);
-			console.warn(
-				`${color.yellow}using ${currentRepoPath} configuration${color.reset}`
-			);
-		}
-		// If package.json exists, load repository details from it
-		else if (fs.existsSync(packageJsonPath)) {
-			const repoPath = path.resolve(process.cwd());
-			const packageObj = require(packageJsonPath);
-			const repoUrl =
-				packageObj.repository &&
-				packageObj.repository.url.substring(12);
-			const repoEntry = packageObj.main;
-			repos = [
-				{
-					path: repoPath,
-					repo: repoUrl,
-					entry: repoEntry
-				}
-			];
-			directory = path.dirname(packageJsonPath);
-			console.warn(
-				`${color.yellow}using ${packageJsonPath} configuration${color.reset}`
-			);
+async function main(config = {}, options) {
+	let directory = options["directory"] || process.cwd();
+	if (!config.repositories) {
+		let configString = options["config"];
+		if (configString) {
+			try {
+				config = JSON.parse(configString);
+				console.warn(
+					`${color.yellow}using supplied JSON configuration${color.reset}`
+				);
+			} catch (error) {
+				directory = configString;
+				config = await getConfig(directory);
+			}
+		} else {
+			config = await getConfig(directory);
 		}
-		// Error if no configuration can be found
-		else {
-			console.error(
-				`${color.red}a configuration file cannot be found${color.reset}`
-			);
-			process.exit(1);
+
+		if (!config.configPath) {
+			const package = await getConfig(directory, "package.json");
+			if (package.configPath) {
+				config.configPath = package.configPath;
+				const repoUrl =
+					package.repository && package.repository.url.substring(12);
+				config.repositories = [
+					{
+						path: package.configPath,
+						repo: repoUrl,
+						entry: package.main
+					}
+				];
+			} else {
+				console.error(
+					`${color.red}config file cannot be found${color.reset}`
+				);
+				process.exit(1);
+			}
 		}
+
+		directory = path.dirname(config.configPath);
+		console.warn(
+			`${color.yellow}using config ${config.configPath} ${color.reset}`
+		);
 	}
 
-	// Set default config values
-	config = { hideMessage: false, ...config };
+	config.hideMessage = false;
 
-	// Add metadata to repos if any are present
-	if (repos && repos.length) repos = await addMeta(repos, [], directory);
+	// Add metadata to repositories if any are present
+	if (config.repositories && config.repositories.length) {
+		config.repositories = await addMeta(config.repositories, [], directory);
+	}
 
 	// Execute the command across repositories
-	const failed = await execute(command, repos, config);
+	const failed = await execute(command, config);
 
 	// Handle any failed command executions
 	if (failed && failed.length > 0) {
@@ -134,7 +121,7 @@ async function main(config = {}, repos = null, directory = null) {
 		}
 
 		// Prompt user to retry failed commands
-		await promptRetry(failed, config, directory);
+		await promptRetry(failed, config, options);
 	}
 }
 
@@ -144,7 +131,7 @@ async function main(config = {}, repos = null, directory = null) {
  * @param {Object} config - Configuration object.
  * @param {string} directory - Path of the configuration directory.
  */
-async function promptRetry(failed, config, directory) {
+async function promptRetry(failed, config, options) {
 	const rl = readline.createInterface({
 		input: process.stdin,
 		output: process.stdout
@@ -155,7 +142,8 @@ async function promptRetry(failed, config, directory) {
 		async (answer) => {
 			rl.close();
 			if (answer.toLowerCase() === "yes") {
-				await main(config, failed, directory);
+				config.repositories = failed;
+				await main(config, options);
 			} else {
 				process.exit(0);
 			}
@@ -164,4 +152,4 @@ async function promptRetry(failed, config, directory) {
 }
 
 // Call the main function with initial configuration
-main(config);
+main(config, options);

package/src/commands/upload.js

@@ -1,102 +1,78 @@
-const file = require('@cocreate/file')
-const path = require('path');
-const fs = require('fs');
+const file = require("@cocreate/file");
+const path = require("path");
+const fs = require("fs");
+const { getConfig } = require("../getConfig");
 
 module.exports = async function upload(directory, args) {
-    if (args && !Array.isArray(args))
-        args = [args]
-
-    let isWatch = false
-    if (directory && typeof directory === 'string') {
-        if (['-w', '--watch'].includes(directory)) {
-            isWatch = true
-            directory = process.cwd()
-        }
-    } else
-        directory = process.cwd()
-
-    if (isWatch || args.includes('-w') || args.includes('--watch')) {
-        for (let i = 0; i < args.length; i++) {
-            if (args[i].startsWith('-'))
-                continue
-            else if (path.isAbsolute(args[i]))
-                directory = args[i]
-            else
-                directory = path.resolve(directory, args[i]);
-        }
-
-        console.log('Watching: ', directory)
-        fs.watch(directory, { recursive: true }, async (eventType, filename) => {
-            if (!filename.includes('CoCreate.config.js')) {
-                const { config, configPath, filePath } = await getConfig(directory, filename);
-                if (config) {
-                    await file(config, configPath, filePath)
-                } else {
-                    console.log(`Failed to read or parse CoCreate.config.js for file: ${filename}`);
-                }
-            }
-        });
-
-    } else {
-        if (!args.length) {
-            directory = process.cwd()
-            const { config, configPath, filePath } = await getConfig(directory);
-            if (config) {
-                await file(config, configPath, filePath)
-            } else {
-                console.log('Failed to read or parse CoCreate.config.js.');
-            }
-
-        } else {
-            for (let arg of args) {
-                let CoCreateConfig
-
-                try {
-                    CoCreateConfig = JSON.parse(arg)
-                } catch (error) { }
-
-
-                if (!CoCreateConfig) {
-                    const { config, configPath, filePath } = await getConfig(arg);
-                    if (config) {
-                        await file(config, configPath, filePath)
-                    } else {
-                        console.log('Failed to read or parse CoCreate.config.js.');
-                    }
-                }
-            }
-        }
-    }
-
-    async function getConfig(directory, filename = '') {
-        let config, configPath
-        const filePath = path.resolve(directory, filename);
-        if (!filePath.includes('node_modules/')) {
-            configPath = findClosestConfig(filePath)
-            if (configPath) {
-                config = require(configPath)
-            } else {
-                console.log('No CoCreate.config file found in parent directories.');
-            }
-        }
-
-        return { config, configPath, filePath };
-    }
-
-    function findClosestConfig(filePath) {
-        let currentDir = filePath;
-
-        while (currentDir !== '/' && currentDir !== '.') {
-            let configFile = path.join(currentDir, 'CoCreate.config.js');
-
-            if (fs.existsSync(configFile)) {
-                return configFile;
-            }
-
-            currentDir = path.dirname(currentDir);
-        }
-
-        return null;
-    }
-
-}
+	if (args && !Array.isArray(args)) args = [args];
+
+	let isWatch = false;
+	if (directory && typeof directory === "string") {
+		if (["-w", "--watch"].includes(directory)) {
+			isWatch = true;
+			directory = process.cwd();
+		}
+	} else directory = process.cwd();
+
+	if (isWatch || args.includes("-w") || args.includes("--watch")) {
+		for (let i = 0; i < args.length; i++) {
+			if (args[i].startsWith("-")) continue;
+			else if (path.isAbsolute(args[i])) directory = args[i];
+			else directory = path.resolve(directory, args[i]);
+		}
+
+		console.log("Watching: ", directory);
+		fs.watch(
+			directory,
+			{ recursive: true },
+			async (eventType, filename) => {
+				if (!filename.includes("CoCreate.config.js")) {
+					const config = await getConfig(directory, filename);
+					if (config.configPath) {
+						await file(config, config.configPath, config.filePath);
+					} else {
+						console.log(
+							"Failed to read or parse CoCreate.config.js."
+						);
+					}
+				}
+			}
+		);
+	} else {
+		if (!args.length) {
+			const CoCreateConfig = await getConfig(directory);
+			if (CoCreateConfig.configPath) {
+				await file(
+					CoCreateConfig,
+					CoCreateConfig.configPath,
+					CoCreateConfig.filePath
+				);
+			} else {
+				console.log("Failed to read or parse CoCreate.config.js.");
+			}
+		} else {
+			for (let arg of args) {
+				let CoCreateConfig;
+
+				try {
+					CoCreateConfig = JSON.parse(arg);
+				} catch (error) {}
+
+				if (!CoCreateConfig) {
+					CoCreateConfig = await getConfig(arg);
+					if (CoCreateConfig.configPath) {
+						await file(
+							CoCreateConfig,
+							CoCreateConfig.configPath,
+							CoCreateConfig.filePath
+						);
+					} else {
+						console.log(
+							"Failed to read or parse CoCreate.config.js."
+						);
+					}
+				}
+			}
+		}
+	}
+};

package/src/execute.js

@@ -3,9 +3,11 @@ const fs = require("fs");
 const spawn = require("./spawn");
 const util = require("node:util");
 const exec = util.promisify(require("node:child_process").exec);
+const { getConfig } = require("./getConfig");
+
 const { color } = require("./fonts");
 
-module.exports = async function execute(command, repos = [], config) {
+module.exports = async function execute(command, config) {
 	let failed = [];
 	let [filename, ...args] = command.replaceAll("'", '"').trim().split(" ");
 
@@ -22,7 +24,7 @@ module.exports = async function execute(command, repos = [], config) {
 	let isPredefined = fs.existsSync(predefined);
 	let repositories = [];
 
-	for (let repo of repos) {
+	for (let repo of config.repositories || []) {
 		try {
 			if (
 				repo.exclude &&
@@ -71,7 +73,7 @@ module.exports = async function execute(command, repos = [], config) {
 	}
 
 	if (isPredefined) {
-		failed = require(predefined)(repositories, args);
+		failed = await require(predefined)(repositories, args);
 	}
 
 	return failed;

package/src/getConfig.js

@@ -0,0 +1,37 @@
+const fs = require("fs");
+const path = require("path");
+
+async function getConfig(directory, filename = "CoCreate.config.js") {
+	let config;
+	const filePath = path.resolve(directory, filename);
+	if (!filePath.includes("node_modules/")) {
+		const configPath = findClosestConfig(filePath, "CoCreate.config.js");
+		if (configPath) {
+			config = require(configPath);
+			config.configPath = configPath;
+			config.filePath = filePath;
+		} else {
+			console.log("No CoCreate.config file found in parent directories.");
+		}
+	}
+
+	return config;
+}
+
+function findClosestConfig(filePath, filename) {
+	let currentDir = filePath;
+
+	while (currentDir !== "/" && currentDir !== ".") {
+		let configFile = path.join(currentDir, filename);
+
+		if (fs.existsSync(configFile)) {
+			return configFile;
+		}
+
+		currentDir = path.dirname(currentDir);
+	}
+
+	return null;
+}
+
+module.exports = { getConfig, findClosestConfig };