@cocreate/cli 1.17.2 → 1.19.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.19.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.18.0...v1.19.0) (2023-03-29)
+
+
+### Features
+
+* link supports defining repos to excute and repolist to link ([a8c50dc](https://github.com/CoCreate-app/CoCreate-cli/commit/a8c50dcf810280b2cb61aa6b23748768ca90485d))
+
+# [1.18.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.17.2...v1.18.0) (2023-03-29)
+
+
+### Bug Fixes
+
+* else condition if file exist ([df1eaa0](https://github.com/CoCreate-app/CoCreate-cli/commit/df1eaa0bd4de9f1d7858e0d97655df0ef9784e62))
+
+
+### Features
+
+* if install true symlink will install packages then will run link. fixed directory path ([97103bf](https://github.com/CoCreate-app/CoCreate-cli/commit/97103bfd1949a5db26ac836e0ba385c108f25f20))
+
 ## [1.17.2](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.17.1...v1.17.2) (2023-03-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.17.2",
+  "version": "1.19.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",

package/src/addMeta.js

@@ -11,7 +11,8 @@ module.exports = async function addMeta(repos, failed, directory) {
 
         if (directory) {
             repos[i].absolutePath = path.resolve(directory, repos[i].path);
-            repos[i].directory = directory;        
+            const parsedPath = path.parse(repos[i].absolutePath);
+            repos[i].directory = parsedPath.dir       
         }
 
         let packagejson = path.resolve(repos[i].absolutePath, 'package.json');
@@ -21,40 +22,41 @@ module.exports = async function addMeta(repos, failed, directory) {
                 name: repos[i].name,
                 des: '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].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, 'yarn.lock');
-                    if (fs.existsSync(lockFile))
-                        repos[i].packageManager = 'yarn'
-                    else {
-                        const { error } = await exec('yarn --version');
-                        if (!error)
+            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, 'yarn.lock');
+                        if (fs.existsSync(lockFile))
                             repos[i].packageManager = 'yarn'
+                        else {
+                            const { error } = await exec('yarn --version');
+                            if (!error)
+                                repos[i].packageManager = 'yarn'
+                        }
+                        packageManager = repos[i].packageManager
                     }
-                    packageManager = repos[i].packageManager
                 }
             }
         }

package/src/commands/clone.js

@@ -8,6 +8,7 @@ module.exports = async function gitClone(repos) {
     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) {
             let exitCode = await spawn('mkdir', ['-p', repos[i].directory], { stdio: 'inherit', cwd: process.cwd() })
             if (exitCode !== 0) {

package/src/commands/install.js

@@ -4,11 +4,14 @@ module.exports = async function(repos) {
     let failed = [];
     try {
         let cloneFailed = await require('./clone.js')(repos)
+        if (cloneFailed)
+            failed.push(cloneFailed)
+
         repos = await addMeta(repos, failed)
 
         let symlinkFailed = await require('./symlink.js')(repos)
-        let linkFailed = await require('./link.js')(repos)
-        failed = [...cloneFailed, ...symlinkFailed, ...linkFailed];
+        if (symlinkFailed)
+           failed.push(symlinkFailed)
     } catch (err) {
         console.error(err);
         failed.push({ name: 'general', des: err.message })

package/src/commands/link.js

@@ -1,16 +1,20 @@
 const spawn = require('../spawn');
 const colors = require('colors');
 
-module.exports = async function linkPackages(repos) {
+module.exports = async function linkPackages(repos, repoList) {
     const failed = [], isLinked = {};
 
     try {
         for (let repo of repos) {
             if (!repo) continue;
+            if (repo.exclude && repo.exclude.includes('link')) 
+                continue
 
             console.log(repo.packageName, 'configuring ...')
-            await doLink(repo.deps, repo, repos, failed, isLinked)
-            await doLink(repo.devDeps, repo, repos, failed, isLinked)
+            if (!repoList)
+                repoList = repos
+            await doLink(repo.deps, repo, repoList, failed, isLinked)
+            await doLink(repo.devDeps, repo, repoList, failed, isLinked)
         }
     }
     catch (err) {

package/src/commands/symlink.js

@@ -2,9 +2,10 @@ const fs = require('fs')
 const path = require("path")
 const util = require('node:util');
 const exec = util.promisify(require('node:child_process').exec);
+const spawn = require('../spawn');
 
 const cwdPath = path.resolve(process.cwd());
-const cwdNodeModulesPath = path.resolve(cwdPath, 'node_modules')
+let cwdNodeModulesPath = path.resolve(cwdPath, 'node_modules')
 
 
 // let doInstall = process.argv[2];
@@ -15,9 +16,13 @@ module.exports = async function symlink(repos) {
     reposLength = repos.length
 
     for (let i = 0; i < repos.length; i++) {
-        if (repos[i].install == true) {
+ 
+        if (cwdPath === repos[i].absolutePath && !fs.existsSync(cwdNodeModulesPath)) {
+            await install(repos[i], repos)    
             reposLength -= 1
-            await install(repos[i])
+        } else if (repos[i].install == true) {
+            reposLength -= 1
+            await install(repos[i], repos)
         } else if (cwdPath !== repos[i].absolutePath) {
             await createSymlink(repos[i])
         }
@@ -76,31 +81,45 @@ function erSymlink(name, dest){
 }
 
 
-async function install(repo) {
+async function install(repo, repos) {
     let dpath = repo.absolutePath
     if (!fs.existsSync(dpath)) {
         failed.push({name: 'install', des: 'path doesn\'t exist:' + dpath})
         return console.error(dpath, 'not exist')
     }
     try {
-        // let node_modules = path.resolve(dpath, 'node_modules');
-        // if (fs.existsSync(node_modules)) {
-        //     fs.rm(node_modules, { recursive: true, force: true }, function (err) {
-        //         if (err) {
-        //             console.log('failed');
-        //         } else {
-        //             erSymlink(repo.name, dest)
-        //         }
-        //     });
-        // }
-        let {error} = await exec(`${repo.packageManager} install `, { cwd: dpath })
-        if (!error)
-            console.log(repo.name, 'installed')
-        else {
-            failed.push({name: 'install ', des: error})
-            console.error(repo.name, 'failed to install', error)
+        let exitCode = await spawn(repo.packageManager, ['install'], {
+            cwd: repo.absolutePath,
+            shell: true,
+            stdio: 'inherit'
+        });
+        
+        if (exitCode !== 0) {
+            failed.push({
+                name: repo.name,
+                des: `${repo.packageManager} install failed`
+            })
+            console.error(`${repo.name}: ${repo.packageManager} install failed`.red)
+        } else {
+            // ToDo: needs to run on defined repo but stiil require all repos in order to xecute on correct path
+            let linkFailed = await require('./link.js')([repo], repos)
+            if (linkFailed)
+                failed.push(linkFailed)
+
         }
 
+        // let {error} = await exec(`${repo.packageManager} install `, { cwd: dpath })
+        // if (!error) {
+        //     console.log(repo.name, 'installed')
+        //     let linkFailed = await require('./link.js')([repo])
+        //     if (linkFailed)
+        //         failed.push(linkFailed)
+ 
+        // } else {
+        //     failed.push({name: 'install ', des: error})
+        //     console.error(repo.name, 'failed to install', error)
+        // }
+
     }
     catch (err) {
         console.error(repo.name, 'did not install', err)