@decohere/ci-tools 0.0.1-dev.113 → 0.0.1-dev.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/ci-tools",
-  "version": "0.0.1-dev.113",
+  "version": "0.0.1-dev.115",
   "description": "CI utility scripts for badge generation, coverage reporting, pages artifact assembly, and GitHub API tooling",
   "keywords": [
     "typescript",

package/src/github/publish-verify.mjs

@@ -1,28 +1,25 @@
 import { spawnSync } from "node:child_process";
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { readFileSync } from "node:fs";
+import { join, relative, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
+import { listProjectDirs } from "../lib/workspace-packages.mjs";
 
 /**
- * Workspace packages that `forge publish` will upload (not `"private": true`).
+ * Workspace packages that `forge publish` will upload (not `"private": true`), including
+ * grouped ones such as `projects/data/data-typeorm`.
  * @param {string} root
  */
 export function listPublishablePackages(root) {
-	const projectsDir = join(root, "projects");
 	const packages = [];
-	for (const dir of readdirSync(projectsDir)) {
-		const pkgPath = join(projectsDir, dir, "package.json");
-		if (!existsSync(pkgPath)) {
-			continue;
-		}
-		const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+	for (const projectDir of listProjectDirs(root)) {
+		const pkg = JSON.parse(readFileSync(join(projectDir, "package.json"), "utf8"));
 		if (typeof pkg.name !== "string" || pkg.private === true) {
 			continue;
 		}
 		packages.push({
 			name: pkg.name,
 			version: pkg.version,
-			dir,
+			dir: relative(join(root, "projects"), projectDir),
 		});
 	}
 	return packages.sort((a, b) => a.name.localeCompare(b.name));

package/src/lib/github-issue.mjs

@@ -47,7 +47,9 @@ export function upsertIssue(options, run = gh) {
 			"--limit",
 			"200",
 			"--search",
-			`${title} in:title`,
+			// Quoted: GitHub's search can't match a title like `security(ci): …` unquoted (#681).
+			// The exact-title match in pickIssue still decides.
+			`"${title.replaceAll('"', "")}" in:title`,
 			"--json",
 			"number,title,state,url",
 		]),

package/src/lib/workspace-packages.mjs

@@ -0,0 +1,30 @@
+import { existsSync, readdirSync } from "node:fs";
+import { join } from "node:path";
+
+// The same rule as WorkspaceDefaults in @decohere/mesh (`projects/**/package.json`, minus these
+// folders, and a package.json inside another project is not a project). CI scripts run on plain
+// Node before any install, so they can't import mesh itself.
+const SKIP = new Set(["node_modules", "__fixtures__", "dist"]);
+
+/**
+ * Every project directory under `<root>/projects`, at any depth (`projects/cli`,
+ * `projects/data/data-typeorm`).
+ * @param {string} root
+ * @returns {string[]} absolute paths
+ */
+export function listProjectDirs(root) {
+	const found = [];
+	const walk = (dir) => {
+		if (existsSync(join(dir, "package.json"))) {
+			found.push(dir);
+			return;
+		}
+		for (const entry of readdirSync(dir, { withFileTypes: true })) {
+			if (entry.isDirectory() && !SKIP.has(entry.name) && !entry.name.startsWith(".")) {
+				walk(join(dir, entry.name));
+			}
+		}
+	};
+	walk(join(root, "projects"));
+	return found;
+}

package/src/release/npm-links.mjs

@@ -4,8 +4,9 @@
  * Outputs markdown formatted links for GitHub release notes
  */
 
-import { readdirSync, readFileSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { join } from "node:path";
+import { listProjectDirs } from "../lib/workspace-packages.mjs";
 
 const VERSION = process.argv[2] || process.env.VERSION;
 
@@ -15,20 +16,12 @@ if (!VERSION) {
 }
 
 let links = "## Published Packages\n\n";
-const projectsDir = join(process.cwd(), "projects");
 
 try {
-	const projects = readdirSync(projectsDir);
-
-	for (const project of projects) {
-		const pkgPath = join(projectsDir, project, "package.json");
-		try {
-			const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-			if (pkg.name?.startsWith("@decohere/")) {
-				links += `- [\`${pkg.name}@${VERSION}\`](https://www.npmjs.com/package/${pkg.name}/v/${VERSION})\n`;
-			}
-		} catch {
-			// Skip projects without package.json
+	for (const projectDir of listProjectDirs(process.cwd())) {
+		const pkg = JSON.parse(readFileSync(join(projectDir, "package.json"), "utf8"));
+		if (pkg.name?.startsWith("@decohere/")) {
+			links += `- [\`${pkg.name}@${VERSION}\`](https://www.npmjs.com/package/${pkg.name}/v/${VERSION})\n`;
 		}
 	}
 

package/tests/github/publish-verify.test.mjs

@@ -47,6 +47,26 @@ describe("publish-verify", () => {
 		]);
 	});
 
+	it("lists grouped packages (projects/<group>/<name>) and skips nested and build folders", () => {
+		const root = seedWorkspace();
+		vol.fromJSON({
+			[`${root}/projects/data/data/package.json`]: JSON.stringify({ name: "@decohere/data" }),
+			[`${root}/projects/data/data-typeorm/package.json`]: JSON.stringify({
+				name: "@decohere/data-typeorm",
+			}),
+			[`${root}/projects/cli/examples/demo/package.json`]: JSON.stringify({ name: "nested" }),
+			[`${root}/projects/__fixtures__/app/package.json`]: JSON.stringify({ name: "fixture" }),
+			[`${root}/projects/node_modules/dep/package.json`]: JSON.stringify({ name: "dep" }),
+			[`${root}/projects/dist/out/package.json`]: JSON.stringify({ name: "built" }),
+		});
+		expect(listPublishablePackages(root).map((pkg) => pkg.name)).toEqual([
+			"@decohere/cli",
+			"@decohere/create",
+			"@decohere/data",
+			"@decohere/data-typeorm",
+		]);
+	});
+
 	it("parses GHCR repository coordinates", () => {
 		expect(parseGhcrRepository("ghcr.io/typesmiths/decohere/create")).toEqual({
 			org: "typesmiths",

package/tests/lib/github-issue.test.mjs

@@ -28,6 +28,17 @@ describe("github-issue", () => {
 		expect(pickIssue([], TITLE)).toBeNull();
 	});
 
+	// #681: GitHub's search can't match `security(ci): …` unquoted, so the lookup found nothing
+	// and a new issue was opened on every run.
+	it("searches for the title as a quoted phrase", () => {
+		const { run, calls } = fakeGh([]);
+		upsertIssue({ title: "security(ci): npm audit vulnerabilities detected", body: "b" }, run);
+		const args = calls[0].args;
+		expect(args[args.indexOf("--search") + 1]).toBe(
+			'"security(ci): npm audit vulnerabilities detected" in:title',
+		);
+	});
+
 	it("opens an issue with assignees when none has the title", () => {
 		const { run, calls } = fakeGh([]);
 		const result = upsertIssue({ title: TITLE, body: "body", assignees: ["das974"] }, run);