@cocreate/cli 1.30.0 → 1.31.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.31.1](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.31.0...v1.31.1) (2023-06-10)
+
+
+### Bug Fixes
+
+* Update file dependency version and add console colors, minor code refactoring to CoCreate Config. ([c836d3a](https://github.com/CoCreate-app/CoCreate-cli/commit/c836d3ae070c41704300f5af646b708a01f8f63b))
+
+# [1.31.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.30.0...v1.31.0) (2023-06-09)
+
+
+### Features
+
+* exposed functions to module.exports ([1a11a4a](https://github.com/CoCreate-app/CoCreate-cli/commit/1a11a4a49041e10b31e4aa9ad358da3da0ec4c01))
+* Refactor configuration loading logic, add prompts for env variables, and allow nested choices ([63c8567](https://github.com/CoCreate-app/CoCreate-cli/commit/63c8567bfb1cd700d1f921685fe7812cb3dc1919))
+
 # [1.30.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.29.3...v1.30.0) (2023-06-07)
 
 

package/CoCreate.config.js

@@ -1,9 +1,7 @@
 module.exports = {
-    "config": {
-        "organization_id": "",
-        "key": "",
-        "host": ""
-    },
+    "organization_id": "",
+    "key": "",
+    "host": "",
     "sources": [
         {
             "collection": "files",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.30.0",
+  "version": "1.31.1",
   "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",
@@ -53,13 +53,13 @@
     "type": "GitHub Sponsors ❤",
     "url": "https://github.com/sponsors/CoCreate-app"
   },
-  "main": "index.js",
+  "main": "src/commands/index.js",
   "bin": {
     "coc": "src/coc.js"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.7.15",
-    "@cocreate/file": "^1.0.0",
+    "@cocreate/docs": "^1.8.2",
+    "@cocreate/file": "^1.1.0",
     "colors": "latest",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"

package/src/coc.js

@@ -1,9 +1,10 @@
-#!/usr/bin/env node
+#!/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 colors = require('colors');
 
 
 if (argv.length < 1) {
@@ -57,7 +58,7 @@ if (config['c'] && fs.existsSync(config['c'])) {
     }];
     directory = path.dirname(packageJsonPath);
     console.warn(`using ${packageJsonPath} configuration`.yellow);
-} 
+}
 // else {
 //     console.error(`a configuration file can not be found`.red);
 //     process.exit(1);

package/src/commands/config.js

@@ -1,11 +1,9 @@
 const readline = require('readline');
-const { promises: fs } = require("fs");
 const os = require('os');
 const path = require('path');
+const fs = require('fs');
 
-
-module.exports = async function CoCreateConfig(config = {}) {
-
+module.exports = async function CoCreateConfig(items, processEnv = true, updateGlobal = true) {
     async function promptForInput(question) {
         const rl = readline.createInterface({
             input: process.stdin,
@@ -20,47 +18,102 @@ module.exports = async function CoCreateConfig(config = {}) {
         });
     }
 
-    // Check if the config file exists
-    const configFilePath = path.join(os.homedir(), 'CoCreateConfig.json');
-    try {
-        const configFileContent = await fs.readFile(configFilePath, 'utf8');
-        config = JSON.parse(configFileContent);
-    } catch (error) {
-        // Ignore error if the file doesn't exist
-    }
-
-    // Prompt user for organization ID if not already stored
-    if (!config.organization_id)
-        config.organization_id = await promptForInput('Enter your organization_id: ');
+    const filterEmptyValues = (obj) => {
+        return Object.fromEntries(
+            Object.entries(obj).filter(([_, value]) => {
+                if (typeof value === 'object' && !Array.isArray(value)) {
+                    return Object.keys(value).length > 0;
+                } else if (Array.isArray(value)) {
+                    return value.length > 0;
+                } else {
+                    return value !== '';
+                }
+            })
+        );
+    };
 
-    if (!config.host)
-        config.host = await promptForInput('Enter the host: ');
+    let config = {};
+    let update = false;
 
+    async function getConfig(items) {
+        if (!Array.isArray(items)) {
+            items = [items];
+        }
+        for (let i = 0; i < items.length; i++) {
+            let { key, prompt, choices } = items[i];
+            if (!key) {
+                if (!prompt && prompt !== '' || !choices) continue;
+                for (let choice of Object.keys(choices)) {
+                    // if (!Array.isArray(choiceItems)) {
+                    //     choiceItems = [choiceItems];
+                    // }
+                    // for (let choice of choiceItems) {
+                    let choiceKey = choices[choice].key
+                    if (process.env[choiceKey]) {
+                        config[choiceKey] = process.env[choiceKey];
+                        return;
+                    } else if (localConfig[choiceKey]) {
+                        config[choiceKey] = localConfig[choiceKey];
+                        return;
 
-    async function promptForSignInOrKey() {
-        const option = await promptForInput('Choose an option:\n1. Sign In\n2. Enter Key\n');
+                    } else if (globalConfig[choiceKey]) {
+                        config[choiceKey] = globalConfig[choiceKey];
+                        return;
+                    }
+                }
+                // }
+                const answer = await promptForInput(prompt || `${key}: `);
+                const choice = choices[answer];
+                if (choice) {
+                    await getConfig(choice);
+                }
+            } else {
 
-        if (option === '1') {
-            if (!config.email)
-                config.email = await promptForInput('Enter your email: ');
+                if (process.env[key]) {
+                    config[key] = process.env[key];
+                } else if (localConfig[key]) {
+                    config[key] = localConfig[key];
+                } else if (globalConfig[key]) {
+                    config[key] = globalConfig[key];
+                } else if (prompt || prompt === '') {
+                    config[key] = await promptForInput(prompt || `${key}: `);
+                    if (processEnv) process.env[key] = config[key];
+                    if (updateGlobal) update = true;
+                }
+            }
+        }
+    }
 
-            if (!config.password)
-                config.password = await promptForInput('Enter your password: ');
+    let localConfig = {};
+    const localConfigPath = path.resolve(process.cwd(), 'CoCreate.config.js');
+    if (fs.existsSync(localConfigPath)) {
+        localConfig = require(localConfigPath);
+    }
 
-        } else if (option === '2') {
-            if (!config.key)
-                config.key = await promptForInput('Enter the key: ');
-        } else {
-            console.log('Invalid option. Please try again.');
-            await promptForSignInOrKey();
-        }
+    let globalConfig = {};
+    const globalConfigPath = path.resolve(os.homedir(), 'CoCreate.config.js');
+    if (fs.existsSync(globalConfigPath)) {
+        globalConfig = require(globalConfigPath);
     }
-    if (!config.key && (!config.email || !config.password))
-        await promptForSignInOrKey();
 
+    if (items) {
+        await getConfig(items);
 
-    // Save the config to the file
-    await fs.writeFile(configFilePath, JSON.stringify(config, null, 2));
+        if (update) {
+            const updatedGlobalConfig = {
+                ...filterEmptyValues(globalConfig),
+                ...filterEmptyValues(config)
+            };
+
+            const globalConfigString = `module.exports = ${JSON.stringify(updatedGlobalConfig, null, 2)};`;
+            fs.writeFileSync(globalConfigPath, globalConfigString);
+        }
+    } else {
+        config = {
+            ...filterEmptyValues(globalConfig),
+            ...filterEmptyValues(localConfig)
+        };
+    }
 
-    return config
+    return config;
 }

package/src/commands/index.js

@@ -0,0 +1,3 @@
+const config = require('./config.js');
+
+module.exports = { config }

package/src/commands/upload.js

@@ -1,8 +1,5 @@
-const crud = require('@cocreate/crud-client')
-const mime = require('mime-types')
-const fs = require('fs');
 const file = require('@cocreate/file')
 
 module.exports = async function upload(repos, args) {
-    file
+    await file()
 }