enablement-build-monorepo-version 1.0.13 → 1.0.17

package/index.mjs

@@ -119,6 +119,18 @@ async function main(options) {
     const scanlist = [];
     const changedFolders = [];
 
+    const changeConfig = path.join(options.prefixPath,options.hashFile);
+    let previous = {};
+
+    // make sure hash config file exits
+    if(!existsSync(changeConfig)) {
+      writeFileSync(changeConfig, "{}", "utf8");
+    }
+
+    // load previous hashes
+    let data = readFileSync(changeConfig, "utf8");
+    previous=JSON.parse(data);
+
     let children = options.children.replace(/\s/g,",");
     children.split(',').forEach((packageFolder)=>{
       scanlist.push(new Promise((resolve, reject) => {
@@ -137,99 +149,77 @@ async function main(options) {
             current[name]={hash:children[i].hash,...v};
           }
 
-          const changeConfig = path.join(options.prefixPath,options.hashFile);
-          let previous = {};
+          if(options.changed || options.version || options.tag) {
 
-          // make sure hash config file exits
-          if(!existsSync(changeConfig)) {
-            writeFileSync(changeConfig, "{}", "utf8");
-          }
-
-          // load previous hashes
-          readFile(changeConfig, "utf8", async (error, data) => {
-            if (error) {
-              console.log(error);
-              reject(error);
-              return;
+            let dependencies={};
+            if(options.dependencies) {
+              if(existsSync(options.dependencies)) {
+                dependencies = dependencyMap(options.dependencies);
+                if(options.debug) console.log('Loaded dependencies\n',JSON.stringify(dependencies));
+              } else {
+                console.log('\x1b[33m%s\x1b[0m', `Could not load dependency file ${options.dependencies}`);
+              }
             }
-            previous=JSON.parse(data);
 
-            if(options.changed || options.version || options.tag) {
+            let results = await compare(packageFolder, previous,current,dependencies,options);
+            if(options.debug) console.log("COMPARE",JSON.stringify(results));
 
-              let dependencies={};
-              if(options.dependencies) {
-                if(existsSync(options.dependencies)) {
-                  dependencies = dependencyMap(options.dependencies);
-                  if(options.debug) console.log('Loaded dependencies\n',JSON.stringify(dependencies));
-                } else {
-                  console.log('\x1b[33m%s\x1b[0m', `Could not load dependency file ${options.dependencies}`);
-                }
+            for(let i=0;i<results.length;i++) {
+              if(results[i].value.changed) {
+                changeList.push(results[i].value.name);
+                if(changedFolders.indexOf(results[i].value.packageFolder)<0) changedFolders.push(results[i].value.packageFolder);
               }
+            }
 
-              let results = await compare(packageFolder, previous,current,dependencies,options);
-              if(options.debug) console.log("COMPARE",JSON.stringify(results));
-
-              for(let i=0;i<results.length;i++) {
+            for(let i=0;i<results.length;i++) {
+              if(results[i].value.packageFolder!==packageFolder) continue;
+              if(options.version) {
+                if(options.debug) console.log(results[i]);
+                let safeName = results[i].value.name;
+                safeName = safeName.replace(/-/g, '').replace(/_/g, '').replace(/\./g, '');
                 if(results[i].value.changed) {
-                  changeList.push(results[i].value.name);
-                  if(changedFolders.indexOf(results[i].value.packageFolder)<0) changedFolders.push(results[i].value.packageFolder);
+                  console.log(`##vso[task.setvariable variable=${safeName};isoutput=true;]${results[i].value.version}`);
+                  if(options.saveVersion) {
+                    scanlist.push(updateVersion(packageFolder,results[i].value.name,results[i].value.version));
+                  }
+                } else {
+                  console.log(`##vso[task.setvariable variable=${safeName};isoutput=true;]${results[i].value.previous}`);
                 }
               }
-
-              for(let i=0;i<results.length;i++) {
-                if(results[i].value.packageFolder!==packageFolder) continue;
-                if(options.version) {
-                  if(options.debug) console.log(results[i]);
-                  let safeName = results[i].value.name;
-                  safeName = safeName.replace(/-/g, '').replace(/_/g, '').replace(/\./g, '');
-                  if(results[i].value.changed) {
-                    console.log(`##vso[task.setvariable variable=${safeName};isoutput=true;]${results[i].value.version}`);
-                    if(options.saveVersion) {
-                      scanlist.push(updateVersion(packageFolder,results[i].value.name,results[i].value.version));
+              if(options.tag) {
+                scanlist.push(new Promise((resolve,reject)=>{
+                  let v = results[i].value.version;
+                  if(!v) v=getCurrentVersion(options.prefixPath,packageFolder,results[i].value.name)?.version;
+                  let rev=results[i].value.name+'@'+v;
+                  v=results[i].value.name+'/'+v;
+                  exec(`git describe --tags ${v}`, (err, tag, stderr) => {
+                    if (err) {
+                        exec(`git tag ${v} -m "${rev}"`, (err, tag, stderr) => {
+                          if (err) {
+                              reject(err);
+                              return;
+                          }
+                          resolve(rev);
+                        });
+                        return;
                     }
-                  } else {
-                    console.log(`##vso[task.setvariable variable=${safeName};isoutput=true;]${results[i].value.previous}`);
-                  }
-                }
-                if(options.tag) {
-                  scanlist.push(new Promise((resolve,reject)=>{
-                    let v = results[i].value.version;
-                    if(!v) v=getCurrentVersion(options.prefixPath,packageFolder,results[i].value.name)?.version;
-                    let rev=results[i].value.name+'@'+v;
-                    v=results[i].value.name+'/'+v;
-                    exec(`git describe --tags ${v}`, (err, tag, stderr) => {
-                      if (err) {
-                          exec(`git tag ${v} -m "${rev}"`, (err, tag, stderr) => {
-                            if (err) {
-                                reject(err);
-                                return;
-                            }
-                            resolve(rev);
-                          });
-                          return;
-                      }
-                    });
-                  }));
-                }
+                  });
+                }));
               }
             }
+          }
 
-            // write current hashes
-            if(options.hash) {
-              let names = Object.keys(current);
-              for(let i=0;i<names.length;i++) {
-                if(current[names[i]].packageFolder!==packageFolder) continue;
-                let v = getCurrentVersion(options.prefixPath,packageFolder,names[i]);
-                current[names[i]].version = v.version;
-                current[names[i]].fullName = v.fullName;
-              }
-
-              writeFileSync(changeConfig, JSON.stringify(current, null, 2), "utf8");
-              console.log('folder hashes written successfully');
+          // save current hashes
+          if(options.hash) {
+            let names = Object.keys(current);
+            for(let i=0;i<names.length;i++) {
+              if(current[names[i]].packageFolder!==packageFolder) continue;
+              let v = getCurrentVersion(options.prefixPath,packageFolder,names[i]);
+              current[names[i]].version = v.version;
+              current[names[i]].fullName = v.fullName;
             }
-
-            resolve("OK");
-          });
+          }
+          resolve("OK");
         })
         .catch(error => {
           return console.error('hashing failed:', error);
@@ -249,6 +239,13 @@ async function main(options) {
           });
         }
       }
+
+      // write current hashes
+      if(options.hash) {
+        writeFileSync(changeConfig, JSON.stringify(current, null, 2), "utf8");
+        console.log('folder hashes written successfully');
+      }
+
       mainResolve("DONE");
     },mainreject);
   });
@@ -306,7 +303,6 @@ if (process.argv.length === 2) {
       const text = await main(options);
       console.log(text);
   } catch (e) {
-      console.log("KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK")
       console.log(e);
       process.exit(1);
   }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "enablement-build-monorepo-version",
-  "version": "1.0.13",
+  "version": "1.0.17",
   "description": "This detects changes in the children packages of a monorepo.",
   "type": "module",
   "module": "./index.mjs",
   "bin": "./index.mjs",
   "license": "MIT",
   "author": "Chris Doty",
-  "dependencies": {
-    "minimatch": "~5.1.2"
-  },
   "scripts": {
     "start": "node index.mjs"
+  },
+  "dependencies": {
+    "minimatch": "~5.1.2"
   }
 }