Naming and cleanup

Author: jamesdaniels

scripts/build.js

@@ -1,8 +1,8 @@
 #! /usr/bin/env node
 const { spawn } = require("child_process");
-const { lernaScopeArgs } = require("./github.js");
+const { lernaScopes } = require("./github.js");
 
-const buildProcess = spawn("lerna", ["run", "build", ...lernaScopeArgs], { stdio: "inherit" });
+const buildProcess = spawn("lerna", ["run", "build", ...lernaScopes], { stdio: "inherit" });
 
 buildProcess.on("close", (code) => {
   process.exit(code);

scripts/github.js

@@ -1,7 +1,7 @@
 #! /usr/bin/env node
 const { execSync } = require("child_process");
 
-const [, packageFromRef, versionFromRef, , prerelease] =
+const [, packagePatternFromRef, versionFromRef, , prereleaseFromRef] =
   /^refs\/tags\/(.+)-v(\d\d*\.\d\d*(\.\d\d*)?(-.+)?)$/.exec(process.env.GITHUB_REF ?? "") ?? [];
 
 const since = process.env.GITHUB_ACTION
@@ -17,30 +17,36 @@ const lernaList = JSON.parse(
 const ref = process.env.GITHUB_SHA ?? "HEAD";
 const shortSHA = execSync(`git rev-parse --short ${ref}`).toString().trim();
 
-const filteredLernaList = JSON.parse(
+const scopedLernaList = JSON.parse(
   execSync(
-    `lerna list --json --toposort --include-dependents ${
-      packageFromRef ? `--scope='{,*/}${packageFromRef}'` : since
+    `lerna list --json --no-private --toposort --include-dependents ${
+      packagePatternFromRef ? `--scope='{,*/}${packagePatternFromRef}'` : since
     }`,
     { stdio: ["ignore", "pipe", "ignore"] },
   ).toString(),
-).filter((lerna) => {
-  if (lerna.private) return false;
-  return true;
-});
+);
 
-if (packageFromRef && filteredLernaList.length === 0) {
+const packagesFromRef = packagePatternFromRef && JSON.parse(
+  execSync(
+    `lerna list --json --no-private --scope='{,*/}${packagePatternFromRef}'`,
+    { stdio: ["ignore", "pipe", "ignore"] },
+  ).toString(),
+);
+if (packagePatternFromRef && packagesFromRef.length !== 1) {
   throw new Error(`Lerna didn't find ${packageFromRef} in this workspace`);
 }
+const packageFromRef = packagesFromRef?.[0].name;
 
-const lernaScopeArgs = filteredLernaList.map(({ name }) => ["--scope", name]).flat();
+const lernaScopes = scopedLernaList.map(({ name }) => ["--scope", name]).flat();
 
 module.exports = {
-  packageFromRef,
-  versionFromRef,
-  prerelease: !packageFromRef || !!prerelease,
+  taggedRelease: packageFromRef ? {
+    name: packageFromRef,
+    version: versionFromRef,
+    tag: prereleaseFromRef ? "next" : "latest",
+  } : undefined,
   lernaList,
-  filteredLernaList,
+  scopedLernaList,
   shortSHA,
-  lernaScopeArgs,
+  lernaScopes,
 };

scripts/publish.js

@@ -3,12 +3,11 @@ const { execSync } = require("child_process");
 const { writeFileSync, readFileSync } = require("fs");
 const { join } = require("path");
 const {
-  filteredLernaList,
+  scopedLernaList,
   lernaList,
   versionFromRef,
   shortSHA,
-  prerelease,
-  packageFromRef,
+  taggedRelease,
 } = require("./github.js");
 
 const wombatDressingRoomTokens = new Map([
@@ -24,18 +23,18 @@ wombatDressingRoomTokens.forEach((token, pkg) => {
   });
 });
 
-const packagesToPublish = filteredLernaList.map((lerna) => {
-  const useVersionFromRef = versionFromRef && lerna.name.endsWith(packageFromRef);
-  if (useVersionFromRef && versionFromRef.split("-")[0] !== lerna.version) {
+const packagesToPublish = scopedLernaList.map((lerna) => {
+  const isTaggedRelease = lerna.name === taggedRelease?.name;
+  if (isTaggedRelease && taggedRelease.version.split("-")[0] !== lerna.version) {
     throw new Error(
       `Cowardly refusing to publish ${lerna.name}@${versionFromRef} from ${lerna.version}, version needs to be bumped in source.`,
     );
   }
-  const newVersion = useVersionFromRef ? versionFromRef : `${lerna.version}-canary.${shortSHA}`;
+  const newVersion = isTaggedRelease ? taggedRelease.version : `${lerna.version}-canary.${shortSHA}`;
   const registry = wombatDressingRoomTokens.get(lerna.name)
     ? `https://wombat-dressing-room.appspot.com/${lerna.name}/_ns`
     : "https://registry.npmjs.org";
-  const tag = useVersionFromRef ? (prerelease ? "next" : "latest") : "canary";
+  const tag = isTaggedRelease ? taggedRelease.tag : "canary";
   const packageJsonPath = join(lerna.location, "package.json");
   const packageJson = JSON.parse(readFileSync(packageJsonPath).toString());
   packageJson.version = newVersion;

scripts/test.js

@@ -1,8 +1,8 @@
 #! /usr/bin/env node
 const { spawn } = require("child_process");
-const { lernaScopeArgs } = require("./github.js");
+const { lernaScopes } = require("./github.js");
 
-const testProcess = spawn("lerna", ["run", "test", "--verbose", "--no-bail", ...lernaScopeArgs], {
+const testProcess = spawn("lerna", ["run", "test", "--verbose", "--no-bail", ...lernaScopes], {
   stdio: "inherit",
 });
 testProcess.on("close", (code) => {