typescript-bedrock 0.1.5 → 0.1.7

package/files/.github/workflows/typescript.yml

@@ -3,7 +3,7 @@ name: TypeScript
 
 on:
   push:
-    branches: [main]
+    branches: [main, master]
   pull_request:
 
 permissions:

package/files/base/.github/workflows/base.yml

@@ -2,7 +2,7 @@ name: Base
 
 on:
   push:
-    branches: [main]
+    branches: [main, master]
   pull_request:
 
 permissions:

package/files/base/blocks/AGENTS.md

@@ -1,5 +1,5 @@
 - Run each task through `just`. `just` lists the recipes. Check each change with the narrowest one, such as `just rust::test` or `just lint`, and run `just verify` once before you finish a change that alters behavior.
 - Fix the cause of each lint, type, or guard error in the code. Keep the shared configs as they are; the bedrock that wrote them owns them.
-- Put project recipes in `project.just`. The `justfile` and `.just/` are shared and get replaced on the next adopt.
+- Put project recipes in `project.just`. The `justfile` and `.just/` are shared and get replaced on the next adopt. A recipe there named `project-<task>`, such as `project-verify` or `project-test`, runs after the languages' `<task>`, so a project extends `just verify` there.
 - Write commit messages as Conventional Commits; the commit-msg hook checks them.
 - When a recipe reports a missing tool, run `just setup`, which installs the pinned ones. Install any it can't, such as `just`, Bun, rustup, or Xcode, with the system's package manager, then rerun the recipe. Tell the user what you installed, and keep the check instead of skipping it.

package/files/base/justfile

@@ -1,6 +1,7 @@
 # Every bedrock repo shares this file. Each language adds `.just/<language>.just`,
 # so `just <task>` runs the task for every language the repo has. Put project
-# recipes in `project.just`.
+# recipes in `project.just`; a recipe there named `project-<task>`, such as
+# `project-verify`, runs after the languages' <task>.
 
 set shell := ["bash", "-euo", "pipefail", "-c"]
 
@@ -58,6 +59,10 @@ each recipe:
             {{ just_executable() }} "$language::{{ recipe }}"
         fi
     done
+    # project.just extends a task with a recipe named project-<task>.
+    case " $({{ just_executable() }} --summary) " in
+        *" project-{{ recipe }} "*) {{ just_executable() }} "project-{{ recipe }}" ;;
+    esac
 
 [private]
 lint-markdown *args:

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "typescript-bedrock",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"description": "Strictest Bun + TypeScript 7 tooling: shared configs, git hooks, a guard, and an adopt command.",
 	"license": "MIT",
 	"author": "xsyetopz",

package/src/adopt/manifest.ts

@@ -55,20 +55,22 @@ const migrateScripts = (
 	for (const [name, command] of Object.entries(tools)) {
 		if (kept[name] !== undefined && kept[name] !== command) {
 			notes.push(
-				`Replaced script "${name}" (${JSON.stringify(kept[name])}) with ${JSON.stringify(command)}. Move any step it still needs, such as a build, into "${name}".`,
+				`Replaced script "${name}" (${JSON.stringify(kept[name])}) with ${JSON.stringify(command)}. Move any step it still needs, such as a build, into a \`project-${name}\` recipe in project.just, which \`just ${name}\` runs.`,
 			);
 		}
 	}
 	return { scripts: { ...kept, test: kept["test"] ?? test, ...tools }, notes };
 };
 
+const isRemoved = (name: string, template: Json): boolean =>
+	REMOVED_PACKAGES.test(name) && !(name in template);
+
 /** Drops the packages Bun and the bedrock tools replace, except the ones the template ships. */
 const removePackages = (
 	deps: unknown,
 	template: Json,
 ): { deps: Json; removed: string[] } => {
-	const removes = (name: string): boolean =>
-		REMOVED_PACKAGES.test(name) && !(name in template);
+	const removes = (name: string): boolean => isRemoved(name, template);
 	const entries = Object.entries(asRecord(deps));
 	return {
 		deps: Object.fromEntries(entries.filter(([name]) => !removes(name))),
@@ -130,13 +132,25 @@ const migrateOverrides = (manifest: Json, template: Json): Json => {
 };
 
 /** Bun runs no install scripts unless the package is trusted. */
-const trustedDependencies = (manifest: Json, pnpm?: Json): string[] => [
-	...new Set([
-		...asStrings(asRecord(manifest["pnpm"])["onlyBuiltDependencies"]),
-		...asStrings(pnpm?.["onlyBuiltDependencies"]),
-	]),
+const trustedDependencies = (
+	manifest: Json,
+	template: Json,
+	pnpm?: Json,
+): string[] => [
+	...new Set(
+		[
+			...asStrings(manifest["trustedDependencies"]),
+			...asStrings(asRecord(manifest["pnpm"])["onlyBuiltDependencies"]),
+			...asStrings(pnpm?.["onlyBuiltDependencies"]),
+		].filter((name) => !isRemoved(name, template)),
+	),
 ];
 
+const removedKeyNotes = (next: Json): string[] =>
+	REMOVED_KEYS.filter((name) => name in next).map(
+		(key) => `Removed the "${key}" field from package.json.`,
+	);
+
 export const migrateManifest = (
 	manifest: Json,
 	template: Json,
@@ -154,9 +168,11 @@ export const migrateManifest = (
 		asRecord(manifest["scripts"]),
 		asRecord(template["scripts"]),
 	);
-	const trusted = trustedDependencies(manifest, pnpm);
+	const trusted = trustedDependencies(manifest, shipped, pnpm);
 	const next: Json = {
-		...manifest,
+		...Object.fromEntries(
+			Object.entries(manifest).filter(([key]) => key !== "trustedDependencies"),
+		),
 		...(Object.keys(prod.deps).length > 0 ||
 		manifest["dependencies"] !== undefined
 			? { dependencies: prod.deps }
@@ -176,13 +192,10 @@ export const migrateManifest = (
 		...migrateOverrides(manifest, template),
 		...(trusted.length > 0 ? { trustedDependencies: trusted } : {}),
 	};
-	for (const key of REMOVED_KEYS.filter((name) => name in next)) {
-		notes.push(`Removed the "${key}" field from package.json.`);
-	}
 	return {
 		manifest: Object.fromEntries(
 			Object.entries(next).filter(([key]) => !REMOVED_KEYS.includes(key)),
 		),
-		notes: [...notes, ...scripts.notes],
+		notes: [...notes, ...removedKeyNotes(next), ...scripts.notes],
 	};
 };

package/src/adopt/tests.ts

@@ -25,6 +25,29 @@ const GLOBALS = [
 const usesGlobal = (text: string, name: string): boolean =>
 	new RegExp(`(?<![\\w$.])${name}\\s*[(.]`, "u").test(text);
 
+const IMPORT_CLAUSES = /\bimport\s+(?:type\s+)?([^"';]*?)\s*from\s*["']/gu;
+// Whether the file already binds `name`, by an import or a declaration.
+const binds = (text: string, name: string): boolean => {
+	const declared = new RegExp(
+		`\\b(?:const|let|var|function|class)\\s+${name}\\b`,
+		"u",
+	);
+	const imported = [...text.matchAll(IMPORT_CLAUSES)].some(([, clause]) =>
+		(clause ?? "")
+			.replaceAll(/[{}]/gu, ",")
+			.split(",")
+			.some(
+				(part) =>
+					part
+						.trim()
+						.split(/\s+as\s+/u)
+						.at(-1)
+						?.trim() === name,
+			),
+	);
+	return imported || declared.test(text);
+};
+
 /**
  * Points a Jest or Vitest test file at bun:test, which has the same API: its
  * framework import changes module, and the globals it calls get imported, since
@@ -35,7 +58,9 @@ export const migrateTestFile = (text: string): string => {
 	if (/["']bun:test["']/u.test(imported)) {
 		return imported;
 	}
-	const used = GLOBALS.filter((name) => usesGlobal(text, name));
+	const used = GLOBALS.filter(
+		(name) => usesGlobal(text, name) && !binds(imported, name),
+	);
 	return used.length > 0
 		? `import { ${used.join(", ")} } from "bun:test";\n\n${text}`
 		: text;