fix: various minor toolset issues

Make (peer)dependencies track current version
Add yalc.lock to gitignore and template
Add utf8 as readFile/tryReadFile default encoding
Have valm refresh active pools before each execute
Only parse valma execute output json if no error
Allow release-vault from master with explicit --(pre)release
Allow versioning assemble-packages even with empty package selection

Author: iridiankin

.gitignore

@@ -9,3 +9,4 @@ coverage
 dist
 node_modules
 temp
+yalc.lock

package.json

@@ -27,9 +27,9 @@
     "publish-packages": "vlm publish-packages "
   },
   "devDependencies": {
-    "@valos/toolset-revealer": ">0.34.0-prerelease",
-    "@valos/toolset-vault": ">0.34.0-prerelease",
-    "valma": "^0.34.0-prerelease.1"
+    "@valos/toolset-revealer": "^0.35.0-prerelease.0",
+    "@valos/toolset-vault": "^0.34.0-prerelease.0",
+    "valma": "^0.35.0-prerelease.0"
   },
   "dependencies": {}
 }

packages/toolset-rest-api-gateway-plugin/package.json

@@ -22,6 +22,6 @@
     "fastify-swagger": "^2.3.2"
   },
   "peerDependencies": {
-    "@valos/inspire": "^0.34.0-prerelease.3"
+    "@valos/inspire": "^0.35.0-prerelease.0"
   }
 }

packages/toolset-vault/template.dots/gitignore

@@ -9,3 +9,4 @@ coverage
 dist
 node_modules
 temp
+yalc.lock

packages/toolset-vault/valma/assemble-packages.js

@@ -183,8 +183,8 @@ exports.handler = async (yargv) => {
         entry => entry && !orderedSelections.includes(entry) && vlm.minimatch(entry.name, glob))));
     selections = orderedSelections;
   }
-  if (!selections.length) {
-    vlm.warn("Assembly selection empty, exiting");
+  if (!selections.length && !yargv.versioning) {
+    vlm.warn("Assembly selection empty and no versioning requested, exiting");
     return {
       selectedAssemblies: selections.length, successfulAssemblies: 0, failedAssemblies: 0,
       success: true,
@@ -237,22 +237,29 @@ exports.handler = async (yargv) => {
     vlm.info(`${assemblyErrors || "No"} errors found during assembly`);
   }
 
+  let oldVersion, newVersion;
   if (!yargv.versioning) {
     vlm.info(`${vlm.theme.argument("--no-versioning")} requested:`,
         `no version update, no git commit, no git tag, no ${vlm.theme.path("package.json")
         } finalizer copying`);
   } else {
-    if (assemblyErrors) throw new Error("Versioning requested and errors found during assembly");
-    vlm.info("Updating version, making git commit, creating a lerna git tag and",
-        `updating target ${vlm.theme.path("package.json")}'s`);
+    if (assemblyErrors) throw new Error("Errors found during assembly when trying to bump version");
+    vlm.info("Updating version, making git commit, creating a lerna git tag and/or",
+        `updating assembly target ${vlm.theme.path("package.json")}'s`);
+    let lernaConfig = await vlm.tryReadFile("lerna.json");
+    oldVersion = lernaConfig && JSON.parse(lernaConfig).version;
     await vlm.delegate([
       "lerna version", {
         "conventional-commits": true, amend: (yargv.versioning === "amend"), push: false, yes: true,
-        "force-publish": selections.map(({ name }) => name).join(","),
+        ...(!selections.length ? {} : {
+          "force-publish": selections.map(({ name }) => name).join(","),
+        }),
       },
     ]);
+    lernaConfig = await vlm.tryReadFile("lerna.json");
+    newVersion = lernaConfig && JSON.parse(lernaConfig).version;
     if (!yargv.assemble && !yargv.overwrite) {
-      vlm.info(`Skipping ${vlm.theme.path("package.json")} version updates`, "as",
+      vlm.info(`Skipping assembly target ${vlm.theme.path("package.json")} version updates`, "as",
           vlm.theme.argument(!yargv.assemble ? "--no-assemble" : "--no-overwrite"),
           "was specified");
     } else {
@@ -309,6 +316,8 @@ exports.handler = async (yargv) => {
     }],
     success: false,
   };
+  if (oldVersion) ret.oldVersion = oldVersion;
+  if (newVersion) ret.version = newVersion;
   ret.assemblyBreakdown.push(...selections.map(
       ({ name, packageConfig, packageJSONPath, failure }) => {
     const newConfig = JSON.parse(vlm.shell.head({ "-n": 1000000 }, packageJSONPath));
@@ -330,7 +339,7 @@ exports.handler = async (yargv) => {
     ret.success = true;
     // TODO(iridian): This is less than ideal way to determine the released version. We should be
     // able to get it from lerna directly somehow.
-    ret.version = ret.assemblyBreakdown[2].version;
+    if (!ret.version) ret.version = ret.assemblyBreakdown[2].version;
     vlm.info(vlm.theme.green(`Successfully assembled all packages`), "out of",
         ret.selectedAssemblies, "selected packages");
   } else if (!ret.successfulAssemblies) {

packages/toolset-vault/valma/release-vault.js

@@ -111,11 +111,17 @@ exports.handler = async (yargv) => {
   async function _prepare (preparation) {
     const branches = ((await vlm.delegate("git branch --list --no-color release/* prerelease/*"))
             || "").split("\n")
-        .map(name => name.match(/^((\* )| {2})((pre)?release\/([0-9]*)(\.[0-9]+)?(\.[0-9]+)?)$/))
-        .filter(match => match);
+        .map(name => name.match(
+            /^((\* )| {2})(master|((pre)?release\/([0-9]*)(\.[0-9]+)?(\.[0-9]+)?))$/
+        )).filter(match => match);
     const currentBranchMatch = branches.find(match => match[2]); // 2 <=> search for "* "
-    if (!currentBranchMatch) throw new Error("Current branch is not a (pre)release branch");
-    const [,,, branchName, currentIsPrerelease, major, dotMinor, dotPatch] = currentBranchMatch;
+    if (!currentBranchMatch) throw new Error("Current branch is not master or (pre)release branch");
+    const [,,, branchName, currentIsNotMaster, currentIsPrerelease, major, dotMinor, dotPatch]
+        = currentBranchMatch;
+    if (!currentIsNotMaster && (!yargv.release && !yargv.prerelease)) {
+      throw new Error(
+          "No explicit --release or --prerelease given when trying to release from 'master'");
+    }
     preparation.lernaConfig = require(vlm.path.join(process.cwd(), "lerna.json"));
     const [, minor, patch] = preparation.lernaConfig.version.match(/^[0-9]*\.([0-9]+)\.([0-9]+)/);
     preparation.isRelease = !!yargv.release || !(yargv.prerelease || currentIsPrerelease);

packages/toolset-worker/valma/perspire.js

@@ -132,7 +132,7 @@ exports.handler = async (yargv) => {
   }
 
   const execBody = yargv.exec
-      && (yargv.exec.body || (yargv.exec.path && await vlm.readFile(yargv.exec.path, "utf8")));
+      && (yargv.exec.body || (yargv.exec.path && await vlm.readFile(yargv.exec.path)));
   if (yargv.exec && (typeof execBody !== "string")) {
     console.error("Invalid execBody:", execBody);
     throw new Error(`Invalid exec body, expected a string, got: '${typeof execBody}' for path "${

packages/valma/valma/init.js

@@ -55,7 +55,7 @@ file for yarn (and also for npm, which yarn is based on).
 `);
         continue;
       }
-      let vaultConfig = await vlm.tryReadFile(vlm.path.join("..", "..", "package.json"), "utf8");
+      let vaultConfig = await vlm.tryReadFile(vlm.path.join("..", "..", "package.json"));
       if (vaultConfig !== undefined) {
         // rather brittle name default. Only works for workspaces
         // precisely two nestings under a vault package.json (which is

packages/valma/valma/valma.js

@@ -220,9 +220,15 @@ const _vlm = {
     return Object.assign(Object.create(this), ...customizations);
   },
 
-  readFile: util.promisify(fs.readFile),
-  async tryReadFile (...rest) {
-    try { return await this.readFile(...rest); } catch (error) {
+  _readFile: util.promisify(fs.readFile),
+  readFile: function readFile (filename, encoding = "utf8", ...rest) {
+    return this._readFile(filename, encoding, ...rest);
+  },
+
+  async tryReadFile (filename, encoding = "utf8", ...rest) {
+    try {
+      return await this._readFile(filename, encoding, ...rest);
+    } catch (error) {
       return undefined;
     }
   },
@@ -1068,6 +1074,7 @@ async function handler (vargv) {
  */
 async function execute (args, options = {}) {
   this._flushPendingConfigWrites();
+  this._refreshActivePools();
   const argv = __processArgs(args);
   if ((argv[0] === "vlm") && !Object.keys(options).length) {
     argv.shift();
@@ -1087,7 +1094,6 @@ async function execute (args, options = {}) {
           let result;
           let processedOutput = output;
           try {
-            if (options.stdout === "json") processedOutput = JSON.parse(output);
             if (error) {
               result = error;
             } else if (code || signal) {
@@ -1102,6 +1108,7 @@ async function execute (args, options = {}) {
                 result.signal = signal;
               }
             } else {
+              if (options.stdout === "json") processedOutput = JSON.parse(output);
               this._refreshActivePools();
               this._reloadPackageAndToolsetsConfigs();
               result = (options.onSuccess === undefined) ? processedOutput