@cocreate/cli 1.28.4 → 1.29.1

package/src/addMeta.js

@@ -1,75 +1,75 @@
-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);
-
-        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 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/'));
-            
-            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
+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);
+
+        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 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/'));
+            
+            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
 } 

package/src/coc.js

@@ -1,81 +1,81 @@
 #!/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');
-
-
-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 {
-        return require(path);
-    }
-    catch (err) {
-        console.error('can not read repository file in'.red, path, 'error:'.red, err.message.red);
-        process.exit(1);
-    }
-}
-
-const currentRepoPath = path.resolve(process.cwd(), "./repositories.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(`using ${config['c']} configuration`.yellow);
-} else if (!config['self'] && fs.existsSync(currentRepoPath)) {
-    repos = getRepositories(currentRepoPath);
-    directory = path.dirname(currentRepoPath);
-    console.warn(`using ${currentRepoPath} configuration`.yellow);
-} 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(`using ${packageJsonPath} configuration`.yellow);
-} 
-// else {
-//     console.error(`a configuration file can not be found`.red);
-//     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(' **************** failures **************** '.red);
-            for (let failure of failed)
-                console.log(`${failure.name}: ${failure.des}`.red);
-
-        }
-    }
-})();
+const path = require("path");
+const fs = require("fs");
+const execute = require('./execute');
+const argv = process.argv.slice(2);
+const addMeta = require('./addMeta');
+
+
+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 {
+        return require(path);
+    }
+    catch (err) {
+        console.error('can not read repository file in'.red, path, 'error:'.red, err.message.red);
+        process.exit(1);
+    }
+}
+
+const currentRepoPath = path.resolve(process.cwd(), "./repositories.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(`using ${config['c']} configuration`.yellow);
+} else if (!config['self'] && fs.existsSync(currentRepoPath)) {
+    repos = getRepositories(currentRepoPath);
+    directory = path.dirname(currentRepoPath);
+    console.warn(`using ${currentRepoPath} configuration`.yellow);
+} 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(`using ${packageJsonPath} configuration`.yellow);
+} 
+// else {
+//     console.error(`a configuration file can not be found`.red);
+//     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(' **************** failures **************** '.red);
+            for (let failure of failed)
+                console.log(`${failure.name}: ${failure.des}`.red);
+
+        }
+    }
+})();

package/src/commands/bump.js

@@ -1,85 +1,85 @@
-let fs = require('fs');
-const path = require("path")
-const colors = require('colors');
-const util = require('node:util');
-const exec = util.promisify(require('node:child_process').exec);
-
-
-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 object = require(packageJsonPath)
-            if (object.dependencies) {
-                for (let key of Object.keys(object.dependencies)) {
-                    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(pathList[index] + '/package.json', `@${name}`)
-        }
-
-        console.log('bump versions', item)
-
-        for (let [index, name] of nameList.entries()) {
-            bumpVersion(pathList[index] + '/package.json', name)
-        }
-
-    }
-
-    console.log('completed')
-    return failed;
-}
-
-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})
-    }
-}
-
-function bumpVersion(filePath, name) {
-    let object = require(filePath)
-    if (object) {
-        let newObject = {...object}
-    
-        if (!object.dependencies)
-            return console.log(name, 'not updated')
-        else {
-            for (const name of Object.keys(object.dependencies)) {
-                if (item[name]) {
-                    newObject.dependencies[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})
-    }
-}
+let fs = require('fs');
+const path = require("path")
+const colors = require('colors');
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
+
+
+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 object = require(packageJsonPath)
+            if (object.dependencies) {
+                for (let key of Object.keys(object.dependencies)) {
+                    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(pathList[index] + '/package.json', `@${name}`)
+        }
+
+        console.log('bump versions', item)
+
+        for (let [index, name] of nameList.entries()) {
+            bumpVersion(pathList[index] + '/package.json', name)
+        }
+
+    }
+
+    console.log('completed')
+    return failed;
+}
+
+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})
+    }
+}
+
+function bumpVersion(filePath, name) {
+    let object = require(filePath)
+    if (object) {
+        let newObject = {...object}
+    
+        if (!object.dependencies)
+            return console.log(name, 'not updated')
+        else {
+            for (const name of Object.keys(object.dependencies)) {
+                if (item[name]) {
+                    newObject.dependencies[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})
+    }
+}

package/src/commands/clone.js

@@ -11,12 +11,12 @@ module.exports = async function gitClone(repos, args) {
         if (cwdPath !== repos[i].absolutePath) {
             if (!fs.existsSync(repos[i].directory))
                 fs.mkdirSync(repos[i].directory);
-    
+
             let exitCode = await spawn('git', ['clone', `https://${repos[i].repo}`], { stdio: 'inherit', cwd: repos[i].directory })
             if (exitCode !== 0) {
                 failed.push({ name: repos[i].name, des: `cloning failed` })
             }
-    
+
         }
     }