@cocreate/cli 1.48.0 → 1.50.0

package/src/addMeta.js

@@ -1,75 +1,82 @@
-const fs = require('fs')
-const path = require("path")
-const util = require('node:util');
-const exec = util.promisify(require('node:child_process').exec);
+const fs = require("fs");
+const path = require("path");
+const util = require("node:util");
+const exec = util.promisify(require("node:child_process").exec);
 
 module.exports = async function addMeta(repos, failed, directory) {
-    let packageManager;
-    for (let i = 0; i < repos.length; i++) {
-        repos[i].name = path.basename(repos[i].path);
-        repos[i].plainName = repos[i].name.substring(9);
+	let packageManager;
+	for (let i = 0; i < repos.length; i++) {
+		repos[i].name = path.basename(repos[i].path);
+		repos[i].plainName = repos[i].name.substring(9);
 
-        if (directory) {
-            repos[i].absolutePath = path.resolve(directory, repos[i].path);
-            const parsedPath = path.parse(repos[i].absolutePath);
-            repos[i].directory = parsedPath.dir       
-        }
+		if (directory) {
+			repos[i].absolutePath = path.resolve(directory, repos[i].path);
+			const parsedPath = path.parse(repos[i].absolutePath);
+			repos[i].directory = parsedPath.dir;
+		}
 
-        let packagejson = path.resolve(repos[i].absolutePath, 'package.json');
-        if (!fs.existsSync(packagejson)) {
-            console.error('package json not found for', repos[i].name);
-            failed.push({
-                name: repos[i].name,
-                des: 'package json not found'
-            })
-        } else {
+		let packagejson = path.resolve(repos[i].absolutePath, "package.json");
+		if (!fs.existsSync(packagejson)) {
+			console.error("package json not found for", repos[i].name);
+			failed.push({
+				name: repos[i].name,
+				error: "package json not found"
+			});
+		} else {
+			let packageObj;
+			try {
+				packageObj = require(packagejson);
+			} catch (err) {
+				console.error("packageObj", err.message);
+			}
 
-            let packageObj
-            try {
-                packageObj = require(packagejson);
-            }
-            catch (err) {
-                console.error('packageObj', err.message)
-            }
+			repos[i].packageName = packageObj.name;
 
+			repos[i].deps = Object.keys(
+				packageObj["dependencies"] || {}
+			).filter((packageName) => packageName.startsWith("@cocreate/"));
+			repos[i].devDeps = Object.keys(
+				packageObj["devDependencies"] || {}
+			).filter((packageName) => packageName.startsWith("@cocreate/"));
 
-            repos[i].packageName = packageObj.name;
+			if (!repos[i].packageManager) {
+				if (packageManager) repos[i].packageManager = packageManager;
+				else {
+					repos[i].packageManager = "npm";
+					let lockFile = path.resolve(
+						repos[i].absolutePath,
+						"package-lock.json"
+					);
+					if (!fs.existsSync(lockFile)) {
+						lockFile = path.resolve(
+							repos[i].absolutePath,
+							"pnpm-lock.yaml"
+						);
+						if (fs.existsSync(lockFile))
+							repos[i].packageManager = "pnpm";
+						else {
+							lockFile = path.resolve(
+								repos[i].absolutePath,
+								"yarn.lock"
+							);
+							if (fs.existsSync(lockFile))
+								repos[i].packageManager = "yarn";
+							else {
+								try {
+									const { error } = await exec(
+										"yarn --version"
+									);
+									if (!error)
+										repos[i].packageManager = "yarn";
+								} catch (e) {}
+							}
+						}
+						packageManager = repos[i].packageManager;
+					}
+				}
+			}
+		}
+	}
 
-            repos[i].deps = Object.keys(packageObj['dependencies'] || {})
-                .filter(packageName => packageName.startsWith('@cocreate/'));
-            repos[i].devDeps = Object.keys(packageObj['devDependencies'] || {})
-                .filter(packageName => packageName.startsWith('@cocreate/'));
-            
-            if (!repos[i].packageManager) {
-                if (packageManager)
-                    repos[i].packageManager = packageManager
-                else {
-                    repos[i].packageManager = 'npm'
-                    let lockFile = path.resolve(repos[i].absolutePath, 'package-lock.json');
-                    if (!fs.existsSync(lockFile)) {
-                        lockFile = path.resolve(repos[i].absolutePath, 'pnpm-lock.yaml');
-                        if (fs.existsSync(lockFile))
-                            repos[i].packageManager = 'pnpm'
-                        else {
-                            lockFile = path.resolve(repos[i].absolutePath, 'yarn.lock');
-                            if (fs.existsSync(lockFile))
-                                repos[i].packageManager = 'yarn'
-                            else {
-                                try {
-                                    const { error } = await exec('yarn --version');
-                                    if (!error)
-                                        repos[i].packageManager = 'yarn'
-                                } catch(e) {
-
-                                }
-                            }
-                        }
-                        packageManager = repos[i].packageManager
-                    }
-                }
-            }
-        }
-    }
-
-    return repos
-} 
+	return repos;
+};

package/src/coc.js

@@ -1,115 +1,130 @@
 #!/usr/bin/env node
-const path = require("path");
-const fs = require("fs");
-const execute = require('./execute');
-const argv = process.argv.slice(2);
-const addMeta = require('./addMeta');
-const { color } = require('./fonts');
-
-
-if (argv.length < 1) {
-    console.error("enter some command to do something");
-    process.exit(1);
-}
-let repos, command, config = {};
-
-const options = ['-self']
-for (let option of options) {
-    if (argv.includes(option)) {
-        config.self = true
-        const index = argv.indexOf(option);
-        delete argv[index];
-    }
-}
-
-command = argv
-    .map((part) => part.match(/ |'|"/) ? `'${part.replace(/'/, '\\\'')}'` : part)
-    .join(" ");
-
-function getRepositories(path) {
-    try {
-        const config = require(path);
-        return config.repositories;
-    }
-    catch (err) {
-        console.error(color.red + 'can not read repository file in' + color.reset, path, color.red + 'error:' + color.reset, err.message);
-        process.exit(1);
-    }
-}
-
-// TODO: handle getting closest config
-async function getConfig(directory, filename = '') {
-    const filePath = path.resolve(directory, filename);
-    if (!filePath.includes('node_modules')) {
-        const configPath = findClosestConfig(filePath)
-        if (configPath) {
-            return { config: require(configPath), configPath, filePath };
-
-        } else {
-            console.log('No CoCreate.config file found in parent directories.');
-        }
-    }
-
-}
-
-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;
-}
-
-
-const currentRepoPath = path.resolve(process.cwd(), "CoCreate.config.js");
-let packageJsonPath = path.resolve(process.cwd(), 'package.json');
-let directory
-
-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);
-} else if (!config['self'] && fs.existsSync(currentRepoPath)) {
-    repos = getRepositories(currentRepoPath);
-    directory = path.dirname(currentRepoPath);
-    console.warn(color.yellow + `using ${currentRepoPath} configuration` + color.reset);
-} else if (fs.existsSync(packageJsonPath)) {
-    let repoPath = path.resolve(process.cwd());
-    let packageObj = require(packageJsonPath);
-    let repoUrl = packageObj.repository.url.substring(12);
-    repos = [{
-        path: `${repoPath}`,
-        repo: `${repoUrl}`
-    }];
-    directory = path.dirname(packageJsonPath);
-    console.warn(color.yellow + `using ${packageJsonPath} configuration` + color.reset);
-}
-// else {
-//     console.error(color.red + `a configuration file can not be found` + color.reset);
-//     process.exit(1);
-// }
-config = { hideMessage: false, ...config };
-
-(async () => {
-    if (repos && repos.length)
-        repos = await addMeta(repos, [], directory)
-    let failed = await execute(command, repos, config);
-    if (failed) {
-        if (failed.length === 0)
-            process.exit(0);
-        else {
-            console.log(color.red + ' **************** failures **************** ' + color.reset);
-            for (let failure of failed)
-                console.log(color.red + `${failure.name}: ${failure.des}` + color.reset);
-
-        }
-    }
-})();
+const path = require("path");
+const fs = require("fs");
+const readline = require("readline");
+const execute = require("./execute");
+const addMeta = require("./addMeta");
+const { color } = require("./fonts");
+
+let config = {};
+
+const argv = process.argv.slice(2);
+const options = ["-self"];
+for (let option of options) {
+	if (argv.includes(option)) {
+		config[option.replace(/^--/, "")] = true;
+		const index = argv.indexOf(option);
+		delete argv[index];
+	}
+}
+
+command = argv
+	.map((part) =>
+		part.match(/ |'|"/) ? `'${part.replace(/'/, "\\'")}'` : part
+	)
+	.join(" ");
+
+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);
+	}
+}
+
+async function main(config = {}, repos = null, directory = null) {
+	if (!repos) {
+		// Existing logic to determine repositories and configuration
+		const currentRepoPath = path.resolve(
+			process.cwd(),
+			"CoCreate.config.js"
+		);
+		const packageJsonPath = path.resolve(process.cwd(), "package.json");
+
+		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}`
+			);
+		} else if (!config["self"] && fs.existsSync(currentRepoPath)) {
+			repos = getRepositories(currentRepoPath);
+			directory = path.dirname(currentRepoPath);
+			console.warn(
+				`${color.yellow}using ${currentRepoPath} configuration${color.reset}`
+			);
+		} 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}`
+			);
+		} else {
+			console.error(
+				`${color.red}a configuration file cannot be found${color.reset}`
+			);
+			process.exit(1);
+		}
+	}
+
+	config = { hideMessage: false, ...config };
+
+	if (repos && repos.length) repos = await addMeta(repos, [], directory);
+
+	const failed = await execute(command, repos, config);
+
+	if (failed && failed.length > 0) {
+		console.log(
+			color.red +
+				" **************** failures **************** " +
+				color.reset
+		);
+		for (const failure of failed) {
+			console.log(
+				color.red + `${failure.name}: ${failure.error}` + color.reset
+			);
+		}
+
+		await promptRetry(failed, config, directory);
+	}
+}
+
+async function promptRetry(failed, config, directory) {
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+
+	rl.question(
+		"Do you want to retry the failed commands? (yes/no): ",
+		async (answer) => {
+			rl.close();
+			if (answer.toLowerCase() === "yes") {
+				await main(config, failed, directory);
+			} else {
+				process.exit(0);
+			}
+		}
+	);
+}
+
+main(config);

package/src/commands/acme.js

@@ -1,25 +1,22 @@
-const { requestCertificate } = require('@cocreate/acme')
+const { requestCertificate } = require("@cocreate/acme");
 
 module.exports = async function nginx(repos, args) {
-    let failed = [];
-
-    try {
-        if (args.length) {
-            if (args[0] === 'create') {
-                args.shift()
-                await createServer(args);
-            } else if (args[0] === 'delete') {
-                args.shift()
-                await deleteServer(args);
-            } else
-                await createServer(args);
-        }
-    } catch (err) {
-        failed.push({ name: 'GENERAL', des: err.message });
-        console.error(err.red);
-    } finally {
-        return failed;
-    }
-
-}
+	let failed = [];
 
+	try {
+		if (args.length) {
+			if (args[0] === "create") {
+				args.shift();
+				await createServer(args);
+			} else if (args[0] === "delete") {
+				args.shift();
+				await deleteServer(args);
+			} else await createServer(args);
+		}
+	} catch (err) {
+		failed.push({ name: "GENERAL", error: err.message });
+		console.error(err.red);
+	} finally {
+		return failed;
+	}
+};